diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-12 15:35:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-12 15:35:53 (GMT) |
| commit | 97f7299854197c6093aaefc1ec174209d68892e7 (patch) | |
| tree | 26777ca5bcfb8c15ee022b28c5b940251b246cc9 /doc | |
| parent | ee6aa8394ec7a93599571336af31b6a06e6e3ffd (diff) | |
| parent | 2efd51c2808874c9217cdaea905754ae72d4e443 (diff) | |
| download | Qt-97f7299854197c6093aaefc1ec174209d68892e7.zip Qt-97f7299854197c6093aaefc1ec174209d68892e7.tar.gz Qt-97f7299854197c6093aaefc1ec174209d68892e7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Destroy the old runtime system only when existing pixmaps were migrated.
Fixed autotest failure in tst_qgl::clipTest.
Added way to destroy the share widget in the GL graphics system.
qdoc: All references to -assistant and -base were removed.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index e1efa21..a5db3c7 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -20,7 +20,7 @@ $$unixstyle { QDOC = $$replace(QDOC, "/", "\\") } ADP_DOCS_QDOCCONF_FILE = -online qt-build-docs.qdocconf -QT_DOCUMENTATION = ($$QDOC -assistant qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ +QT_DOCUMENTATION = ($$QDOC -creator qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \ (cd $$QT_BUILD_TREE && \ $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \ |