From 27daa542d3e99080b59b277b8f177f2f46914c03 Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Mon, 14 Jun 2010 16:55:58 +0200
Subject: [PATCH] We need to check for http only.
---
src/plugins/help/helpviewer_qtb.cpp | 18 +++++++++---------
src/plugins/help/helpviewer_qwv.cpp | 5 +++--
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/plugins/help/helpviewer_qtb.cpp b/src/plugins/help/helpviewer_qtb.cpp
index de9974fbd2e..5e1982a8cbe 100644
--- a/src/plugins/help/helpviewer_qtb.cpp
+++ b/src/plugins/help/helpviewer_qtb.cpp
@@ -144,20 +144,20 @@ QUrl HelpViewer::source() const
void HelpViewer::setSource(const QUrl &url)
{
- const QString &scheme = url.scheme();
- if (scheme != QLatin1String("qthelp") && scheme != QLatin1String("about")) {
- QTextBrowser::setSource(resolvedUrl);
- emit loadFinished(true);
- return;
- }
-
const QString &string = url.toString();
if (url.isValid() && string != QLatin1String("help")) {
if (launchWithExternalApp(url))
return;
- const QHelpEngineCore &engine = HelpManager::instance().helpEngineCore();
- const QUrl &resolvedUrl = engine.findFile(url);
+ QUrl resolvedUrl;
+ if (url.scheme() == QLatin1String("http"))
+ resolvedUrl = url;
+
+ if (!resolvedUrl.isValid()) {
+ const QHelpEngineCore &engine = LocalHelpManager::helpEngine();
+ resolvedUrl = engine.findFile(url);
+ }
+
if (resolvedUrl.isValid()) {
QTextBrowser::setSource(resolvedUrl);
emit loadFinished(true);
diff --git a/src/plugins/help/helpviewer_qwv.cpp b/src/plugins/help/helpviewer_qwv.cpp
index 8c8872edd5f..c25666f9db8 100644
--- a/src/plugins/help/helpviewer_qwv.cpp
+++ b/src/plugins/help/helpviewer_qwv.cpp
@@ -124,9 +124,10 @@ HelpNetworkAccessManager::HelpNetworkAccessManager(QObject *parent)
QNetworkReply *HelpNetworkAccessManager::createRequest(Operation op,
const QNetworkRequest &request, QIODevice* outgoingData)
{
- const QString &scheme = request.url().scheme();
- if (scheme != QLatin1String("qthelp") && scheme != QLatin1String("about"))
+ if (!HelpViewer::isLocalUrl(request.url())
+ && request.url().scheme() == QLatin1String("http")) {
return QNetworkAccessManager::createRequest(op, request, outgoingData);
+ }
QString url = request.url().toString();
const QHelpEngineCore &engine = LocalHelpManager::helpEngine();
--
GitLab