Commit 41e24cb0 authored by Eike Ziller's avatar Eike Ziller Committed by hjk
Browse files

Qt5: Find and register Qt5 documentation.



Qt 5 installs its documentation directly in QT_INSTALL_DOCS, not in a
qch subdir, so we just check both for qch files.

Change-Id: I7360d9695954233437f2042f35b6de194662e623
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 9e377700
......@@ -424,12 +424,14 @@ void QtVersionManager::updateDocumentation()
Q_ASSERT(helpManager);
QStringList files;
foreach (BaseQtVersion *v, m_versions) {
const QString docPath = v->documentationPath() + QLatin1String("/qch/");
const QDir versionHelpDir(docPath);
foreach (const QString &helpFile,
versionHelpDir.entryList(QStringList() << QLatin1String("*.qch"), QDir::Files))
files << docPath + helpFile;
const QStringList docPaths = QStringList() << v->documentationPath() + QLatin1Char('/')
<< v->documentationPath() + QLatin1String("/qch/");
foreach (const QString &docPath, docPaths) {
const QDir versionHelpDir(docPath);
foreach (const QString &helpFile,
versionHelpDir.entryList(QStringList() << QLatin1String("*.qch"), QDir::Files))
files << docPath + helpFile;
}
}
helpManager->registerDocumentation(files);
}
......
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