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

Merge remote-tracking branch 'origin/2.6'

Browse Source
This commit is contained in:
Eike Ziller
2012-10-29 15:13:06 +01:00
parent 5011ba940f 0ae5695649
commit 67b0637934
21 changed files with 109 additions and 67 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();
}
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;
}