summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorBill King <bill.king@nokia.com>2009-12-16 00:24:34 (GMT)
committerBill King <bill.king@nokia.com>2009-12-16 00:24:34 (GMT)
commitd170179f00effe691de23167e02ff5aeecaeb054 (patch)
treeefac88591acea829807cadfbf8f918bfe75b81ce /tools
parentbba8f557f59d17e68ec0d9707e66c5324bb4bd33 (diff)
parentd0fb8557f3fc3e7c9305662d118228ceca9df72b (diff)
downloadQt-d170179f00effe691de23167e02ff5aeecaeb054.zip
Qt-d170179f00effe691de23167e02ff5aeecaeb054.tar.gz
Qt-d170179f00effe691de23167e02ff5aeecaeb054.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/test/qt-build-docs.qdocconf9
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index ef4d04f..e8595f6 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -8,10 +8,11 @@ project = Qt
description = Qt Reference Documentation
url = http://qt.nokia.com/doc/4.7
-edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript QtScriptTools QtSql \
- QtSvg QtWebKit QtXml QtXmlPatterns Qt3Support QtHelp \
- QtDesigner QAxContainer Phonon QAxServer QtUiTools \
- QtTest QtDBus
+edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg \
+ QtWebKit QtXml QtXmlPatterns Qt3Support QtHelp \
+ QtDesigner QtAssistant QAxContainer Phonon \
+ QAxServer QtUiTools QtTest QtDBus
+
edition.DesktopLight.modules = QtCore QtDBus QtGui Qt3SupportLight QtTest
edition.DesktopLight.groups = -graphicsview-api