# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1606574314 -3600
# Node ID 9d25ef0db8a5d8512c149b4f8cbfb20fb735e784
# Parent  10a35049bad7dfb046873876763b2be542364238# Parent  d34558c873dc027576d4b3bb5ab3d7c88ed90a80
maint: merge stable to default.

diff -r 10a35049bad7 -r 9d25ef0db8a5 libgui/src/documentation.cc
--- 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>