summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@digia.com>2012-12-14 12:11:49 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-14 14:07:36 +0100
commit8a2868e27faa91214bd3eec415fccef245bee1c9 (patch)
tree228f4f4b7729438233f3a77cdcddc8475349486d
parent884444d7ebb3753698d9eac6dc98193c5cecc70e (diff)
downloadqttools-8a2868e27faa91214bd3eec415fccef245bee1c9.tar.gz
ActiveQt documentation is not registered in Qt Assistant.
Task-number: QTBUG-28609 Note: there's already an task to add files based on its extension, see QTBUG-28345. Cause this might introduce more regression we decided to go the whitelist route for the 5.0.0 release and fix it the next minor. Change-Id: Ia1f72e0ed39746fca203813bfe8523fd9956fb61 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
-rw-r--r--src/assistant/assistant/mainwindow.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp
index 2aee44209..9d597778a 100644
--- a/src/assistant/assistant/mainwindow.cpp
+++ b/src/assistant/assistant/mainwindow.cpp
@@ -376,13 +376,16 @@ void MainWindow::lookForNewQtDocumentation()
<< QLatin1String("qmake")
<< QLatin1String("qt")
<< QLatin1String("qtqmake")
+ << QLatin1String("activeqt")
<< QLatin1String("qtassistant")
<< QLatin1String("qtconcurrent")
<< QLatin1String("qtcore")
+ << QLatin1String("qtdbus")
<< QLatin1String("qtdesigner")
<< QLatin1String("qtdoc")
<< QLatin1String("qtgraphicaleffects")
<< QLatin1String("qtgui")
+ << QLatin1String("qthelp")
<< QLatin1String("qtimageformats")
<< QLatin1String("qtlinguist")
<< QLatin1String("qtmultimedia")
@@ -395,10 +398,13 @@ void MainWindow::lookForNewQtDocumentation()
<< QLatin1String("qtsql")
<< QLatin1String("qtsvg")
<< QLatin1String("qttestlib")
+ << QLatin1String("qtuitools")
<< QLatin1String("qtwebkit")
+ << QLatin1String("qtwebkitexamples")
<< QLatin1String("qtwidgets")
<< QLatin1String("qtxml")
<< QLatin1String("qtxmlpatterns");
+
QList<QtDocInstaller::DocInfo> qtDocInfos;
foreach (const QString &doc, docs)
qtDocInfos.append(QtDocInstaller::DocInfo(doc, helpEngine.qtDocInfo(doc)));