From 6c580fd71b338d2c6e170e1c94dbf88afcc806ff Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Mon, 16 Aug 2010 15:20:09 +0200
Subject: [PATCH] Make sure we can open local files as well.
Reviewed-by: ck
---
src/plugins/help/helpviewer.cpp | 8 +-------
src/plugins/help/helpviewer_qwv.cpp | 4 +---
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/plugins/help/helpviewer.cpp b/src/plugins/help/helpviewer.cpp
index aadeda402d2..15a53da81c1 100644
--- a/src/plugins/help/helpviewer.cpp
+++ b/src/plugins/help/helpviewer.cpp
@@ -94,13 +94,7 @@ struct ExtensionMap {
bool HelpViewer::isLocalUrl(const QUrl &url)
{
- const QString &scheme = url.scheme();
- return scheme.isEmpty()
- || scheme == QLatin1String("file")
- || scheme == QLatin1String("qrc")
- || scheme == QLatin1String("data")
- || scheme == QLatin1String("qthelp")
- || scheme == QLatin1String("about");
+ return url.scheme() == QLatin1String("qthelp");
}
bool HelpViewer::canOpenPage(const QString &url)
diff --git a/src/plugins/help/helpviewer_qwv.cpp b/src/plugins/help/helpviewer_qwv.cpp
index d47c02982dd..8f8968815f9 100644
--- a/src/plugins/help/helpviewer_qwv.cpp
+++ b/src/plugins/help/helpviewer_qwv.cpp
@@ -124,10 +124,8 @@ HelpNetworkAccessManager::HelpNetworkAccessManager(QObject *parent)
QNetworkReply *HelpNetworkAccessManager::createRequest(Operation op,
const QNetworkRequest &request, QIODevice* outgoingData)
{
- if (!HelpViewer::isLocalUrl(request.url())
- && request.url().scheme() == QLatin1String("http")) {
+ if (!HelpViewer::isLocalUrl(request.url()))
return QNetworkAccessManager::createRequest(op, request, outgoingData);
- }
QString url = request.url().toString();
const QHelpEngineCore &engine = LocalHelpManager::helpEngine();
--
GitLab