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: hjk <qthjk@ovi.com>

1 files changed, 8 insertions, 6 deletions

diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index a229e3d570..81af5ab8c7 100644
--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -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);
 }