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

Help: Prefer litehtml viewer backend over QTextbrowser

Browse Source 
Fixes: QTCREATORBUG-24661
Change-Id: I027da9bffbebcbef600150ca9d842c234fe9de8d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
This commit is contained in:
Eike Ziller
2020-09-21 16:37:32 +02:00
parent f34c6fbebf
commit 5e73215a0a
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,6 +93,7 @@ static const char kLastSelectedTabKey[] = "Help/LastSelectedTab";
static const char kViewerBackend[] = "Help/ViewerBackend"; static const char kViewerBackend[] = "Help/ViewerBackend";
static const char kQtWebEngineBackend[] = "qtwebengine"; static const char kQtWebEngineBackend[] = "qtwebengine";
static const char kLitehtmlBackend[] = "litehtml";
static const char kTextBrowserBackend[] = "textbrowser"; static const char kTextBrowserBackend[] = "textbrowser";
static const int kDefaultFallbackFontSize = 14; static const int kDefaultFallbackFontSize = 14;
@@ -326,9 +327,14 @@ HelpViewerFactory LocalHelpManager::defaultViewerBackend()
} }
if (!backend.isEmpty()) if (!backend.isEmpty())
qWarning("Help viewer backend \"%s\" not found, using default.", backend.constData()); qWarning("Help viewer backend \"%s\" not found, using default.", backend.constData());
const Utils::optional<HelpViewerFactory> factory = backendForId(kQtWebEngineBackend); const Utils::optional<HelpViewerFactory> webengineFactory = backendForId(kQtWebEngineBackend);
if (factory) if (webengineFactory)
return *factory; return *webengineFactory;
const Utils::optional<HelpViewerFactory> litehtmlFactory = backendForId(kLitehtmlBackend);
if (litehtmlFactory)
return *litehtmlFactory;
return backendForId(kTextBrowserBackend).value_or(HelpViewerFactory()); return backendForId(kTextBrowserBackend).value_or(HelpViewerFactory());
} }
@@ -349,7 +355,7 @@ QVector<HelpViewerFactory> LocalHelpManager::viewerBackends()
{kQtWebEngineBackend, tr("QtWebEngine"), []() { return new WebEngineHelpViewer; }}); {kQtWebEngineBackend, tr("QtWebEngine"), []() { return new WebEngineHelpViewer; }});
#endif #endif
#ifdef QTC_LITEHTML_HELPVIEWER #ifdef QTC_LITEHTML_HELPVIEWER
result.append({"litehtml", tr("litehtml"), []() { return new LiteHtmlHelpViewer; }}); result.append({kLitehtmlBackend, tr("litehtml"), []() { return new LiteHtmlHelpViewer; }});
#endif #endif
#ifdef QTC_MAC_NATIVE_HELPVIEWER #ifdef QTC_MAC_NATIVE_HELPVIEWER
result.append({"native", tr("WebKit"), []() { return new MacWebKitHelpViewer; }}); result.append({"native", tr("WebKit"), []() { return new MacWebKitHelpViewer; }});