diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-04 06:38:36 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-04 06:38:36 (GMT) |
| commit | 764f558846b8ee6f115004fc939b890991c40bfa (patch) | |
| tree | 9bd47140cedbc9d8d28702618e6ad86fa6f2f666 /tools/qdoc3/test/qt-build-docs.qdocconf | |
| parent | 9b0c0faf73dbdc382f1c02a42b10018bf9961d72 (diff) | |
| parent | 1400ce5b85fbe7c67899f5f62bfd276eecb21ae0 (diff) | |
| download | Qt-764f558846b8ee6f115004fc939b890991c40bfa.zip Qt-764f558846b8ee6f115004fc939b890991c40bfa.tar.gz Qt-764f558846b8ee6f115004fc939b890991c40bfa.tar.bz2 | |
Merge branch '4.6' of c:\dev\qt-graphics-4.6
Conflicts:
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-inc.qdocconf
Diffstat (limited to 'tools/qdoc3/test/qt-build-docs.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/qt-build-docs.qdocconf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index b517206..470ee30 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -8,10 +8,10 @@ project = Qt description = Qt Reference Documentation url = http://qt.nokia.com/doc/4.7 -edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript 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 |