summaryrefslogtreecommitdiffstats
path: root/doc/doc.pri
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-12-08 16:50:59 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2010-12-08 16:50:59 (GMT)
commit4db69b5c116412bbcdb032affe9fa2c73e61abb1 (patch)
treeb5c1790ebf4f2378b8da59c889320282b705aa38 /doc/doc.pri
parent91205afa07431acb741f2bf7c1fb65ff78b5af36 (diff)
downloadQt-4db69b5c116412bbcdb032affe9fa2c73e61abb1.zip
Qt-4db69b5c116412bbcdb032affe9fa2c73e61abb1.tar.gz
Qt-4db69b5c116412bbcdb032affe9fa2c73e61abb1.tar.bz2
Updated the build files to use config files not command line options.
Diffstat (limited to 'doc/doc.pri')
-rw-r--r--doc/doc.pri4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/doc.pri b/doc/doc.pri
index a5db3c7..3cdac61 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -19,8 +19,8 @@ $$unixstyle {
QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QT_BUILD_TREE/bin/qdoc3.exe $$DOCS_GENERATION_DEFINES
QDOC = $$replace(QDOC, "/", "\\")
}
-ADP_DOCS_QDOCCONF_FILE = -online qt-build-docs.qdocconf
-QT_DOCUMENTATION = ($$QDOC -creator qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
+ADP_DOCS_QDOCCONF_FILE = qt-build-docs-online.qdocconf
+QT_DOCUMENTATION = ($$QDOC 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 && \