diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-26 17:53:45 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-26 17:53:45 (GMT) |
| commit | 8f4160b70888218677e976a68e205f4ca8b7d740 (patch) | |
| tree | 60d392c1f112b6807ddbfda7ff3a40bb6c5b75bf /tools/qdoc3/test | |
| parent | 9b0c0faf73dbdc382f1c02a42b10018bf9961d72 (diff) | |
| parent | 83aa359398a8a510ac732410c918d31eedeeb4f8 (diff) | |
| download | Qt-8f4160b70888218677e976a68e205f4ca8b7d740.zip Qt-8f4160b70888218677e976a68e205f4ca8b7d740.tar.gz Qt-8f4160b70888218677e976a68e205f4ca8b7d740.tar.bz2 | |
Merge remote branch 'origin/4.6'
Conflicts:
tools/qdoc3/test/qt-build-docs.qdocconf
Diffstat (limited to 'tools/qdoc3/test')
| -rw-r--r-- | tools/qdoc3/test/qt-build-docs.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index b517206..0251462 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -8,7 +8,7 @@ project = Qt description = Qt Reference Documentation url = http://qt.nokia.com/doc/4.7 -edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript QtSql \ +edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript QtScriptTools QtSql \ QtSvg QtWebKit QtXml QtXmlPatterns Qt3Support QtHelp \ QtDesigner QAxContainer Phonon QAxServer QtUiTools \ QtTest QtDBus |