summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2019-09-19 23:23:27 +0300
committerOrgad Shaneh <orgads@gmail.com>2019-09-20 07:43:11 +0000
commit064e71afbd6b19749d263a7d5e7ff0d7d0f1115a (patch)
tree917ddb73a74edb4460aafc0742efc35768bbfbfe
parente24ef9ca0859a7c8c968f6b7c47b2fe769d5fc4b (diff)
downloadqt-creator-064e71afbd6b19749d263a7d5e7ff0d7d0f1115a.tar.gz
Help: Fix build
QWebEngineUrlScheme was introduced in Qt 5.12. This amends commit 8d3e4c03f0e27b096c34326abfd357387f963537. Change-Id: Ibd22d97f582a31ad31f12ae37a028c5058a6dd3b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--src/plugins/help/localhelpmanager.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp
index 07ab621ccc..0a29750b85 100644
--- a/src/plugins/help/localhelpmanager.cpp
+++ b/src/plugins/help/localhelpmanager.cpp
@@ -33,8 +33,10 @@
#ifdef QTC_WEBENGINE_HELPVIEWER
#include "webenginehelpviewer.h"
+#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
#include <QWebEngineUrlScheme>
#endif
+#endif
#ifdef QTC_LITEHTML_HELPVIEWER
#include "litehtmlhelpviewer.h"
#endif
@@ -324,6 +326,7 @@ QVector<HelpViewerFactory> LocalHelpManager::viewerBackends()
{
QVector<HelpViewerFactory> result;
#ifdef QTC_WEBENGINE_HELPVIEWER
+#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
static bool schemeRegistered = false;
if (!schemeRegistered) {
schemeRegistered = true;
@@ -331,6 +334,7 @@ QVector<HelpViewerFactory> LocalHelpManager::viewerBackends()
scheme.setFlags(QWebEngineUrlScheme::LocalScheme | QWebEngineUrlScheme::LocalAccessAllowed);
QWebEngineUrlScheme::registerScheme(scheme);
}
+#endif
result.append(
{kQtWebEngineBackend, tr("QtWebEngine"), []() { return new WebEngineHelpViewer; }});
#endif