diff options
| author | Pulse Build System <qt-info@nokia.com> | 2010-01-22 00:53:04 (GMT) |
|---|---|---|
| committer | Pulse Build System <qt-info@nokia.com> | 2010-01-22 00:53:04 (GMT) |
| commit | 0e12da85f8f8ee8b5ddb32e518a25ef168cea9e7 (patch) | |
| tree | cdc404155a92000c1a0b6ebe1fbda74b22457ec0 /tools/qdoc3 | |
| parent | 8e65adce9ced8f3b1d42b938e4d65e1af4768c33 (diff) | |
| parent | 5c8c51284b1119f90520b6dbad0ac23fe0487bcf (diff) | |
| download | Qt-0e12da85f8f8ee8b5ddb32e518a25ef168cea9e7.zip Qt-0e12da85f8f8ee8b5ddb32e518a25ef168cea9e7.tar.gz Qt-0e12da85f8f8ee8b5ddb32e518a25ef168cea9e7.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2:
build fix for mingw
Build fix for MSVC2005 and older SDK
QStyleSheetStyle: Fixed some text croped when having padding with native border.
Remove obsolete code for unsupported platforms
Character spacing when drawing a QPicture to a high DPI device.
Diffstat (limited to 'tools/qdoc3')
| -rw-r--r-- | tools/qdoc3/test/qt-build-docs.qdocconf | 9 |
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 |