diff options
| author | Topi Reinio <topi.reinio@theqtcompany.com> | 2016-05-20 10:27:12 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@theqtcompany.com> | 2016-05-20 11:15:24 +0000 |
| commit | dee2a1883a9371a3aea647d508be7c758b076e8d (patch) | |
| tree | fad2150a0e673b4b9fa52fa40c299f9263c7558a | |
| parent | 87cfa3b24f12ae4cd1ddbb5450b307b95334feb1 (diff) | |
| download | qttools-dee2a1883a9371a3aea647d508be7c758b076e8d.tar.gz | |
Assistant: Use QDesktopServices::openUrl() for all external URLs
Stop filtering external URLs based on their scheme. This allows
Assistant to try opening all non-local URLs in an external
browser.
Change-Id: I61f10ad2f43895f4982d2ae4468d50836011107d
Task-number: QTBUG-53491
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/assistant/assistant/helpviewer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/assistant/assistant/helpviewer.cpp b/src/assistant/assistant/helpviewer.cpp index 7002e4af4..12bd64415 100644 --- a/src/assistant/assistant/helpviewer.cpp +++ b/src/assistant/assistant/helpviewer.cpp @@ -163,10 +163,9 @@ bool HelpViewer::launchWithExternalApp(const QUrl &url) actualTmpFile.close(); return QDesktopServices::openUrl(QUrl(actualTmpFile.fileName())); } - } else if (url.scheme() == QLatin1String("http") || url.scheme() == QLatin1String("mailto")) { - return QDesktopServices::openUrl(url); + return false; } - return false; + return QDesktopServices::openUrl(url); } // -- public slots |