1 files changed, 27 insertions, 5 deletions

diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp
index f8a02eb7cc..461020f4dd 100644
--- a/src/plugins/help/localhelpmanager.cpp
+++ b/src/plugins/help/localhelpmanager.cpp
@@ -46,16 +46,17 @@
 
 #include <app/app_version.h>
 #include <coreplugin/icore.h>
+
 #include <utils/algorithm.h>
 #include <utils/hostosinfo.h>
 #include <utils/optional.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 #include <QDesktopServices>
 #include <QFontDatabase>
-#include <QMutexLocker>
-
 #include <QHelpEngine>
+#include <QMutexLocker>
 
 using namespace Help::Internal;
 
@@ -70,10 +71,14 @@ QHelpEngine* LocalHelpManager::m_guiEngine = nullptr;
 QMutex LocalHelpManager::m_bkmarkMutex;
 BookmarkManager* LocalHelpManager::m_bookmarkManager = nullptr;
 
+#ifndef HELP_NEW_FILTER_ENGINE
+
 QStandardItemModel *LocalHelpManager::m_filterModel = nullptr;
 QString LocalHelpManager::m_currentFilter = QString();
 int LocalHelpManager::m_currentFilterIndex = -1;
 
+#endif
+
 static const char kHelpHomePageKey[] = "Help/HomePage";
 static const char kFontFamilyKey[] = "Help/FallbackFontFamily";
 static const char kFontStyleNameKey[] = "Help/FallbackFontStyleName";
@@ -123,7 +128,9 @@ LocalHelpManager::LocalHelpManager(QObject *parent)
 {
     m_instance = this;
     qRegisterMetaType<Help::Internal::LocalHelpManager::HelpData>("Help::Internal::LocalHelpManager::HelpData");
+#ifndef HELP_NEW_FILTER_ENGINE
     m_filterModel = new QStandardItemModel(this);
+#endif
 }
 
 LocalHelpManager::~LocalHelpManager()
@@ -263,7 +270,7 @@ void LocalHelpManager::setScrollWheelZoomingEnabled(bool enabled)
 QStringList LocalHelpManager::lastShownPages()
 {
     const QVariant value = Core::ICore::settings()->value(kLastShownPagesKey, QVariant());
-    return value.toString().split(Constants::ListSeparator, QString::SkipEmptyParts);
+    return value.toString().split(Constants::ListSeparator, Utils::SkipEmptyParts);
 }
 
 void LocalHelpManager::setLastShownPages(const QStringList &pages)
@@ -275,7 +282,7 @@ QList<float> LocalHelpManager::lastShownPagesZoom()
 {
     const QVariant value = Core::ICore::settings()->value(kLastShownPagesZoomKey, QVariant());
     const QStringList stringValues = value.toString().split(Constants::ListSeparator,
-                                                            QString::SkipEmptyParts);
+                                                            Utils::SkipEmptyParts);
     return Utils::transform(stringValues, [](const QString &str) { return str.toFloat(); });
 }
 
@@ -396,8 +403,12 @@ QHelpEngine &LocalHelpManager::helpEngine()
 {
     if (!m_guiEngine) {
         QMutexLocker _(&m_guiMutex);
-        if (!m_guiEngine)
+        if (!m_guiEngine) {
             m_guiEngine = new QHelpEngine(QString());
+#ifdef HELP_NEW_FILTER_ENGINE
+            m_guiEngine->setUsesFilterEngine(true);
+#endif
+        }
     }
     return *m_guiEngine;
 }
@@ -495,6 +506,8 @@ LocalHelpManager::HelpData LocalHelpManager::helpData(const QUrl &url)
     return data;
 }
 
+#ifndef HELP_NEW_FILTER_ENGINE
+
 QAbstractItemModel *LocalHelpManager::filterModel()
 {
     return m_filterModel;
@@ -544,6 +557,15 @@ void LocalHelpManager::updateFilterModel()
     emit m_instance->filterIndexChanged(m_currentFilterIndex);
 }
 
+#else
+
+QHelpFilterEngine *LocalHelpManager::filterEngine()
+{
+    return helpEngine().filterEngine();
+}
+
+#endif
+
 bool LocalHelpManager::canOpenOnlineHelp(const QUrl &url)
 {
     const QString address = url.toString();