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

Qt5: QUrl doesn't accept paths without leading slash anymore

Browse Source 
Fixes e.g. opening help from the Locator help index filter

Change-Id: I3f7dae08aa83c36119a31d97232b9cdba0ba89fc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
This commit is contained in:
Eike Ziller
2012-10-26 12:58:06 +02:00
parent 2982545dbd
commit ef91bd0505
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/helpmanager.cpp
View File

@@ -167,13 +167,13 @@ void HelpManager::unregisterDocumentation(const QStringList &nameSpaces)
emit documentationChanged(); emit documentationChanged();
} }
QUrl buildQUrl(const QString &nameSpace, const QString &folder, static QUrl buildQUrl(const QString &ns, const QString &folder,
const QString &relFileName, const QString &anchor) const QString &relFileName, const QString &anchor)
{ {
QUrl url; QUrl url;
url.setScheme(QLatin1String("qthelp")); url.setScheme(QLatin1String("qthelp"));
url.setAuthority(nameSpace); url.setAuthority(ns);
url.setPath(folder + QLatin1Char('/') + relFileName); url.setPath(QLatin1Char('/') + folder + QLatin1Char('/') + relFileName);
url.setFragment(anchor); url.setFragment(anchor);
return url; return url;
} }