feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Help: Fix build

Browse Source 
QWebEngineUrlScheme was introduced in Qt 5.12.

This amends commit 8d3e4c03f0.

Change-Id: Ibd22d97f582a31ad31f12ae37a028c5058a6dd3b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Orgad Shaneh
2019-09-19 23:23:27 +03:00
committed by Orgad Shaneh
parent e24ef9ca08
commit 064e71afbd
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/help/localhelpmanager.cpp
View File

@@ -33,8 +33,10 @@
#ifdef QTC_WEBENGINE_HELPVIEWER #ifdef QTC_WEBENGINE_HELPVIEWER
#include "webenginehelpviewer.h" #include "webenginehelpviewer.h"
#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
#include <QWebEngineUrlScheme> #include <QWebEngineUrlScheme>
#endif #endif
#endif
#ifdef QTC_LITEHTML_HELPVIEWER #ifdef QTC_LITEHTML_HELPVIEWER
#include "litehtmlhelpviewer.h" #include "litehtmlhelpviewer.h"
#endif #endif
@@ -324,6 +326,7 @@ QVector<HelpViewerFactory> LocalHelpManager::viewerBackends()
{ {
QVector<HelpViewerFactory> result; QVector<HelpViewerFactory> result;
#ifdef QTC_WEBENGINE_HELPVIEWER #ifdef QTC_WEBENGINE_HELPVIEWER
#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
static bool schemeRegistered = false; static bool schemeRegistered = false;
if (!schemeRegistered) { if (!schemeRegistered) {
schemeRegistered = true; schemeRegistered = true;
@@ -331,6 +334,7 @@ QVector<HelpViewerFactory> LocalHelpManager::viewerBackends()
scheme.setFlags(QWebEngineUrlScheme::LocalScheme | QWebEngineUrlScheme::LocalAccessAllowed); scheme.setFlags(QWebEngineUrlScheme::LocalScheme | QWebEngineUrlScheme::LocalAccessAllowed);
QWebEngineUrlScheme::registerScheme(scheme); QWebEngineUrlScheme::registerScheme(scheme);
} }
#endif
result.append( result.append(
{kQtWebEngineBackend, tr("QtWebEngine"), []() { return new WebEngineHelpViewer; }}); {kQtWebEngineBackend, tr("QtWebEngine"), []() { return new WebEngineHelpViewer; }});
#endif #endif