From 1a3aa6a9ce873de0bf8838fc70a0fcc4ab8888ad Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Thu, 17 Dec 2009 15:51:42 +0100
Subject: [PATCH] Changed help file discovery to include all qch files found.
---
src/plugins/qt4projectmanager/qtversionmanager.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 333a25aa2a4..5d855c6bee7 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -203,12 +203,14 @@ void QtVersionManager::updateDocumentation()
Help::HelpManager *helpManager
= ExtensionSystem::PluginManager::instance()->getObject<Help::HelpManager>();
Q_ASSERT(helpManager);
- QStringList fileEndings = QStringList() << "/qch/qt.qch" << "/qch/qmake.qch" << "/qch/designer.qch";
QStringList files;
foreach (QtVersion *version, m_versions) {
- QString docPath = version->documentationPath();
- foreach (const QString &fileEnding, fileEndings)
- files << docPath+fileEnding;
+ const QString docPath = version->documentationPath() + QLatin1String("/qch/");
+ const QDir versionHelpDir(docPath);
+ foreach (const QString &helpFile,
+ versionHelpDir.entryList(QStringList() << QLatin1String("*.qch"), QDir::Files))
+ files << docPath + helpFile;
+
}
helpManager->registerDocumentation(files);
}
--
GitLab