feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Just use the path as the url can have an anchor attached etc...

Browse Source 
Fixes the broken topic chooser and keyword resolving.

Reviewed-by: ck
(cherry picked from commit e6900ff03d)
This commit is contained in:
kh1
2010-04-20 16:15:21 +02:00
committed by con
parent fb0b092872
commit 47d1931bcc
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/help/helpviewer.cpp
View File

@@ -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) {

2
src/plugins/help/helpviewer.h
View File

@@ -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: