Mercurial > jwe > octave
changeset 29124:9d25ef0db8a5
maint: merge stable to default.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sat, 28 Nov 2020 15:38:34 +0100 |
parents | 10a35049bad7 (current diff) d34558c873dc (diff) |
children | eb6599cf2db5 |
files | |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/documentation.cc Fri Nov 27 17:01:47 2020 -0800 +++ b/libgui/src/documentation.cc Sat Nov 28 15:38:34 2020 +0100 @@ -36,7 +36,8 @@ #include <QFileInfo> #include <QHelpContentWidget> #include <QHelpIndexWidget> -#if defined (HAVE_NEW_QHELPINDEXWIDGET_API) +#if defined (HAVE_NEW_QHELPINDEXWIDGET_API) \ + || defined (HAVE_QHELPENGINE_DOCUMENTSFORIDENTIFIER) # include <QHelpLink> #endif #include <QHelpSearchEngine>