From ef91bd050591e4b8283998ca4ece2c9b038737f9 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 26 Oct 2012 12:58:06 +0200 Subject: [PATCH] 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 Reviewed-by: Karsten Heimrich --- src/plugins/coreplugin/helpmanager.cpp | 6 +++--- 1 file 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; }