summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test
diff options
context:
space:
mode:
authorkh1 <qt-info@nokia.com>2009-08-31 16:01:21 (GMT)
committerkh1 <qt-info@nokia.com>2009-08-31 16:06:15 (GMT)
commitaba48884511d6f5b276b012d3e6346d9bd7bfd3a (patch)
treeaf01a82471222891c50bb3aac7ed38dc50acf354 /tools/qdoc3/test
parent81be8823182ad9bbf058764eaac328c1009d2ac0 (diff)
downloadQt-aba48884511d6f5b276b012d3e6346d9bd7bfd3a.zip
Qt-aba48884511d6f5b276b012d3e6346d9bd7bfd3a.tar.gz
Qt-aba48884511d6f5b276b012d3e6346d9bd7bfd3a.tar.bz2
Remove traces of deprecated Assistant and AssistantClient.
Diffstat (limited to 'tools/qdoc3/test')
-rw-r--r--tools/qdoc3/test/qt-build-docs.qdocconf8
-rw-r--r--tools/qdoc3/test/qt-inc.qdocconf10
-rw-r--r--tools/qdoc3/test/qt.qdocconf6
3 files changed, 12 insertions, 12 deletions
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index 70e3b4f..d8a9057 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -10,10 +10,10 @@ url = http://qt.nokia.com/doc/4.6
edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \
QtXmlPatterns QtTest
-edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript QtSql QtSvg \
- QtWebKit QtXml QtXmlPatterns Qt3Support QtHelp \
- QtDesigner QtAssistant QAxContainer Phonon \
- QAxServer QtUiTools QtTest QtDBus
+edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript QtSql \
+ QtSvg QtWebKit QtXml QtXmlPatterns Qt3Support QtHelp \
+ QtDesigner QAxContainer Phonon QAxServer QtUiTools \
+ QtTest QtDBus
edition.DesktopLight.modules = QtCore QtDBus QtGui Qt3SupportLight QtTest
edition.DesktopLight.groups = -graphicsview-api
diff --git a/tools/qdoc3/test/qt-inc.qdocconf b/tools/qdoc3/test/qt-inc.qdocconf
index 4ef32b8..617a8ca 100644
--- a/tools/qdoc3/test/qt-inc.qdocconf
+++ b/tools/qdoc3/test/qt-inc.qdocconf
@@ -6,9 +6,9 @@ description = Qt Reference Documentation
url = http://qt.nokia.com/doc/4.6
edition.Console = QtCore QtNetwork QtSql QtXml QtScript QtTest
-edition.Desktop = QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript \
- QtDesigner QtAssistant Qt3Support QAxContainer \
- QAxServer QtUiTools QtTest QtDBus
+edition.Desktop = QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml \
+ QtScript QtDesigner Qt3Support QAxContainer QAxServer \
+ QtUiTools QtTest QtDBus
edition.DesktopLight = QtCore QtGui Qt3SupportLight QtTest
language = Cpp
@@ -100,8 +100,8 @@ Cpp.ignoretokens = QAXFACTORY_EXPORT \
Q_TYPENAME \
Q_XML_EXPORT \
QDBUS_EXPORT \
- Q_GADGET \
- QWEBKIT_EXPORT
+ Q_GADGET \
+ QWEBKIT_EXPORT
Cpp.ignoredirectives = Q_DECLARE_HANDLE \
Q_DECLARE_INTERFACE \
Q_DECLARE_METATYPE \
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index 942d023..43e69d5 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -12,9 +12,9 @@ url = http://qt.nokia.com/doc/4.6
edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \
QtXmlPatterns QtTest
-edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg \
- QtWebKit QtXml QtXmlPatterns Qt3Support QtHelp \
- QtDesigner QtAssistant QAxContainer Phonon \
+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.DesktopLight.modules = QtCore QtDBus QtGui Qt3SupportLight QtTest
edition.DesktopLight.groups = -graphicsview-api