diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 10:59:01 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 10:59:01 (GMT) |
| commit | f1aeeb025c5042f6684855006f963e2203d9c153 (patch) | |
| tree | 430cbdfa0c42e23289f7cd4b5907656810dbe895 /tools/qdoc3/test/qt-build-docs.qdocconf | |
| parent | 168524d4f642724fe9063500c0c39ab747f145b6 (diff) | |
| parent | 88412920c58286d22aaa1e121b1030298adf86eb (diff) | |
| download | Qt-f1aeeb025c5042f6684855006f963e2203d9c153.zip Qt-f1aeeb025c5042f6684855006f963e2203d9c153.tar.gz Qt-f1aeeb025c5042f6684855006f963e2203d9c153.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tools/qdoc3/test/qt-build-docs.qdocconf
Diffstat (limited to 'tools/qdoc3/test/qt-build-docs.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/qt-build-docs.qdocconf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index 470ee30..76aac57 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -12,6 +12,7 @@ edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript QtScri 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 |