diff options
| author | David Schulz <david.schulz@qt.io> | 2018-11-16 08:58:03 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-12-03 10:35:03 +0000 |
| commit | 91004e0de3083c6b0fed78171609081d16d83965 (patch) | |
| tree | b2b5d87047e2946b1161723cf285af781cb0bbef | |
| parent | 9401c98097ffdfdec7a882209b10e921ff740502 (diff) | |
| download | qt-creator-4.7.tar.gz | |
Help: fix calling QDesktopServices::openUrl when opening about:blank4.7
Workaround QTBUG-71833
Fixes: QTCREATORBUG-21515
Change-Id: Iffa363ab94a8f71d958b04932c9829887bb00dd7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
(cherry picked from commit fc5caf3e0fff736acf1fc6c30e95b9b40089c03d)
Reviewed-by: David Schulz <david.schulz@qt.io>
| -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 e2cac11fc9..f1a568e918 100644 --- a/src/plugins/help/helpviewer.cpp +++ b/src/plugins/help/helpviewer.cpp @@ -138,6 +138,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)) { |