From 064e71afbd6b19749d263a7d5e7ff0d7d0f1115a Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 19 Sep 2019 23:23:27 +0300 Subject: Help: Fix build QWebEngineUrlScheme was introduced in Qt 5.12. This amends commit 8d3e4c03f0e27b096c34326abfd357387f963537. Change-Id: Ibd22d97f582a31ad31f12ae37a028c5058a6dd3b Reviewed-by: Eike Ziller --- src/plugins/help/localhelpmanager.cpp | 4 ++++ 1 file changed, 4 insertions(+) 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 #endif +#endif #ifdef QTC_LITEHTML_HELPVIEWER #include "litehtmlhelpviewer.h" #endif @@ -324,6 +326,7 @@ QVector LocalHelpManager::viewerBackends() { QVector 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 LocalHelpManager::viewerBackends() scheme.setFlags(QWebEngineUrlScheme::LocalScheme | QWebEngineUrlScheme::LocalAccessAllowed); QWebEngineUrlScheme::registerScheme(scheme); } +#endif result.append( {kQtWebEngineBackend, tr("QtWebEngine"), []() { return new WebEngineHelpViewer; }}); #endif -- cgit v1.2.1