diff options
| author | Pulse Build System <qt-info@nokia.com> | 2010-01-22 12:37:10 (GMT) |
|---|---|---|
| committer | Pulse Build System <qt-info@nokia.com> | 2010-01-22 12:37:10 (GMT) |
| commit | ef5e793a52e59b9e66b1facfe462c0e965501db6 (patch) | |
| tree | 15a355355fb673dc66774a4a040f605051b2b31d /tools | |
| parent | 2c3f2a0c41a9a2b8f1961197369b278d335f9cf1 (diff) | |
| parent | d9532fb7185951ad34e2b11f008cc3ad0a62d5a4 (diff) | |
| download | Qt-ef5e793a52e59b9e66b1facfe462c0e965501db6.zip Qt-ef5e793a52e59b9e66b1facfe462c0e965501db6.tar.gz Qt-ef5e793a52e59b9e66b1facfe462c0e965501db6.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:
Fixed compile for wincewm60standard-msvc2008 (attempt 2)
Fixed compile for wincewm60standard-msvc2008.
Fixed compile.
Fixed compile for wincewm60standard-msvc2008.
Fixed compile when Qt is configured with -no-webkit
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')
| -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 |