diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-11-19 09:48:28 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-11-19 10:00:18 +0100 |
| commit | 3d1d9aae2e977ef599582074e0f4faaef454a595 (patch) | |
| tree | 8cd2aaba4d0ba10c46abd6ce5c10a349d2889e75 /src/plugins/help/helpviewer.cpp | |
| parent | 40ad7ec995332b043ead31ee0739f04dd7ac0e90 (diff) | |
| parent | e164717108176ee1423f3f629a8182520c2909d1 (diff) | |
| download | qt-creator-3d1d9aae2e977ef599582074e0f4faaef454a595.tar.gz | |
Merge remote-tracking branch 'origin/4.8'
Conflicts:
src/plugins/winrt/winrtdevicefactory.cpp
Change-Id: I33b8697e2ebf2bea051d7f1144449e0743ee16a5
Diffstat (limited to 'src/plugins/help/helpviewer.cpp')
| -rw-r--r-- | src/plugins/help/helpviewer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/help/helpviewer.cpp b/src/plugins/help/helpviewer.cpp index 1f6df7baab..1c40bbd111 100644 --- a/src/plugins/help/helpviewer.cpp +++ b/src/plugins/help/helpviewer.cpp @@ -135,6 +135,10 @@ bool HelpViewer::launchWithExternalApp(const QUrl &url) const QUrl &resolvedUrl = helpEngine.findFile(url); if (!resolvedUrl.isValid()) return false; + // Workaround QTBUG-71833 + // QHelpEngineCore::findFile returns a valid url even though the file does not exist + if (resolvedUrl.scheme() == "about" && resolvedUrl.path() == "blank") + return false; const QString& path = resolvedUrl.path(); if (!canOpenPage(path)) { |