Commit 1a3aa6a9 authored by Erik Verbruggen's avatar Erik Verbruggen
Browse files

Changed help file discovery to include all qch files found.

parent cbe7d1ed
...@@ -203,12 +203,14 @@ void QtVersionManager::updateDocumentation() ...@@ -203,12 +203,14 @@ void QtVersionManager::updateDocumentation()
Help::HelpManager *helpManager Help::HelpManager *helpManager
= ExtensionSystem::PluginManager::instance()->getObject<Help::HelpManager>(); = ExtensionSystem::PluginManager::instance()->getObject<Help::HelpManager>();
Q_ASSERT(helpManager); Q_ASSERT(helpManager);
QStringList fileEndings = QStringList() << "/qch/qt.qch" << "/qch/qmake.qch" << "/qch/designer.qch";
QStringList files; QStringList files;
foreach (QtVersion *version, m_versions) { foreach (QtVersion *version, m_versions) {
QString docPath = version->documentationPath(); const QString docPath = version->documentationPath() + QLatin1String("/qch/");
foreach (const QString &fileEnding, fileEndings) const QDir versionHelpDir(docPath);
files << docPath+fileEnding; foreach (const QString &helpFile,
versionHelpDir.entryList(QStringList() << QLatin1String("*.qch"), QDir::Files))
files << docPath + helpFile;
} }
helpManager->registerDocumentation(files); 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