Mercurial > octave

diff libgui/src/documentation.cc @ 29034:e3bc897115ed stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change feature test to OCTAVE_CHECK_NEW_QHELPINDEXWIDGET_API in cset a0ff81c8b8e8. * m4/acinclude.m4: Change name OCTAVE_CHECK_FUNC_QHELPLINK to OCTAVE_CHECK_NEW_QHELPINDEXWIDGET_API. * documentation.cc: Change instances of HAVE_QHELPLINK to HAVE_NEW_QHELPINDEXWIDGET_API.
author Rik <rik@octave.org>
date Thu, 05 Nov 2020 16:50:03 -0800
parents a0ff81c8b8e8
children 94396ec1a89d
line wrap: on
line diff
--- a/libgui/src/documentation.cc	Thu Nov 05 16:51:25 2020 -0500
+++ b/libgui/src/documentation.cc	Thu Nov 05 16:50:03 2020 -0800
@@ -36,8 +36,8 @@
 #include <QFileInfo>
 #include <QHelpContentWidget>
 #include <QHelpIndexWidget>
-#if defined (HAVE_QHELPLINK)
-#include <QHelpLink>
+#if defined (HAVE_NEW_QHELPINDEXWIDGET_API)
+#  include <QHelpLink>
 #endif
 #include <QHelpSearchEngine>
 #include <QHelpSearchQueryWidget>
@@ -185,8 +185,8 @@
 
     if (m_help_engine)
       {
-#if defined (HAVE_QHELPLINK)
-        // Help engine uses filters instead of old api since Qt 5.15
+#if defined (HAVE_NEW_QHELPINDEXWIDGET_API)
+        // Starting in Qt 5.15, help engine uses filters instead of old API
         m_help_engine->setUsesFilterEngine (true);
 #endif
         // Layout contents, index and search
@@ -234,16 +234,16 @@
 
         navi->addTab (index_all, tr ("Function Index"));
 
-#if defined (HAVE_QHELPLINK)
+#if defined (HAVE_NEW_QHELPINDEXWIDGET_API)
         connect (m_help_engine->indexWidget (),
                  &QHelpIndexWidget::documentActivated,
-                  this, [this](const QHelpLink &link) {
+                 this, [this](const QHelpLink &link) {
                         m_doc_browser->handle_index_clicked (link.url);});
 #else
-        connect(m_help_engine->indexWidget (),
-                SIGNAL (linkActivated (const QUrl&, const QString&)),
-                m_doc_browser, SLOT(handle_index_clicked (const QUrl&,
-                                                          const QString&)));
+        connect (m_help_engine->indexWidget (),
+                 SIGNAL (linkActivated (const QUrl&, const QString&)),
+                 m_doc_browser, SLOT(handle_index_clicked (const QUrl&,
+                                                           const QString&)));
 #endif
 
         connect (m_filter, SIGNAL (editTextChanged (const QString&)),