Commit ef91bd05 authored by Eike Ziller's avatar Eike Ziller

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: default avatarDaniel Teske <daniel.teske@digia.com>
Reviewed-by: default avatarKarsten Heimrich <karsten.heimrich@digia.com>
parent 2982545d
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment