From e6900ff03d58a2ec2200ee87ee6b3f5a1d72b8e6 Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Tue, 20 Apr 2010 16:15:21 +0200
Subject: [PATCH] Just use the path as the url can have an anchor attached
etc...
Fixes the broken topic chooser and keyword resolving.
Reviewed-by: ck
---
src/plugins/help/helpviewer.cpp | 7 ++++---
src/plugins/help/helpviewer.h | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/plugins/help/helpviewer.cpp b/src/plugins/help/helpviewer.cpp
index d8726a99cb5..a88393c6657 100644
--- a/src/plugins/help/helpviewer.cpp
+++ b/src/plugins/help/helpviewer.cpp
@@ -109,10 +109,11 @@ bool HelpViewer::canOpenPage(const QString &url)
return !mimeFromUrl(url).isEmpty();
}
-QString HelpViewer::mimeFromUrl(const QString &url)
+QString HelpViewer::mimeFromUrl(const QUrl &url)
{
- const int index = url.lastIndexOf(QLatin1Char('.'));
- const QByteArray &ext = url.mid(index).toUtf8().toLower();
+ const QString &path = url.path();
+ const int index = path.lastIndexOf(QLatin1Char('.'));
+ const QByteArray &ext = path.mid(index).toUtf8().toLower();
const ExtensionMap *e = extensionMap;
while (e->extension) {
diff --git a/src/plugins/help/helpviewer.h b/src/plugins/help/helpviewer.h
index d49f3d1e140..45c33e95d95 100644
--- a/src/plugins/help/helpviewer.h
+++ b/src/plugins/help/helpviewer.h
@@ -91,7 +91,7 @@ public:
static bool isLocalUrl(const QUrl &url);
static bool canOpenPage(const QString &url);
- static QString mimeFromUrl(const QString &url);
+ static QString mimeFromUrl(const QUrl &url);
static bool launchWithExternalApp(const QUrl &url);
public slots:
--
GitLab