aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2012-10-26 12:58:06 +0200
committerEike Ziller <eike.ziller@digia.com>2012-10-26 14:54:17 +0200
commitef91bd050591e4b8283998ca4ece2c9b038737f9 (patch)
tree7c9e7147d6d712d0806bfdc41898b7f4bed3bd8b
parent2982545dbd5b45d765ed5c721017e1054c2822d8 (diff)
Qt5: QUrl doesn't accept paths without leading slash anymore
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>
-rw-r--r--src/plugins/coreplugin/helpmanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/coreplugin/helpmanager.cpp b/src/plugins/coreplugin/helpmanager.cpp
index 692adbd6ad7..c7a17be1695 100644
--- a/src/plugins/coreplugin/helpmanager.cpp
+++ b/src/plugins/coreplugin/helpmanager.cpp
@@ -167,13 +167,13 @@ void HelpManager::unregisterDocumentation(const QStringList &nameSpaces)
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)
{
QUrl url;
url.setScheme(QLatin1String("qthelp"));
- url.setAuthority(nameSpace);
- url.setPath(folder + QLatin1Char('/') + relFileName);
+ url.setAuthority(ns);
+ url.setPath(QLatin1Char('/') + folder + QLatin1Char('/') + relFileName);
url.setFragment(anchor);
return url;
}