diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-20 14:16:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-20 14:16:16 (GMT) |
| commit | b3ff9483fa7e1193e466b62bbcead3e5d99c8c70 (patch) | |
| tree | 8f8f4816ad87c1b4c0bfbca30382fad77cd811be | |
| parent | 6fcbbb233cacfcf658f7f9cae5bb7486c713bc04 (diff) | |
| parent | e8523386a8f977ac8b0e57423d8c949bca6ee5b8 (diff) | |
| download | Qt-b3ff9483fa7e1193e466b62bbcead3e5d99c8c70.zip Qt-b3ff9483fa7e1193e466b62bbcead3e5d99c8c70.tar.gz Qt-b3ff9483fa7e1193e466b62bbcead3e5d99c8c70.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Add dita_docs target to generate DITA output.
| -rw-r--r-- | doc/doc.pri | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index c51a621..ea2fb2e 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -36,6 +36,7 @@ $$unixstyle { DEMOSMANIFESTTARGET = $$replace(DEMOSMANIFESTTARGET, "/", "\\") } ADP_DOCS_QDOCCONF_FILE = qt-build-docs-online.qdocconf +DITA_DOCS_QDOCCONF_FILE = qt-ditaxml.qdocconf QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \ (cd $$QT_BUILD_TREE && \ @@ -69,6 +70,8 @@ win32-g++*:isEmpty(QMAKE_SH) { # Build rules: adp_docs.commands = ($$QDOC $$ADP_DOCS_QDOCCONF_FILE && $$QMAKE_COPY_DIR $$COPYWEBKITGUIDE $$COPYWEBKITTARGB) adp_docs.depends += sub-qdoc3 # qdoc3 +dita_docs.commands = ($$QDOC $$DITA_DOCS_QDOCCONF_FILE) +dita_docs.depends += sub-qdoc3 # qdoc3 qch_docs.commands = $$QT_DOCUMENTATION qch_docs.depends += sub-qdoc3 @@ -103,5 +106,5 @@ docimages.path = $$[QT_INSTALL_DOCS]/src sub-qdoc3.depends = sub-corelib sub-xml sub-qdoc3.commands += (cd tools/qdoc3 && $(MAKE)) -QMAKE_EXTRA_TARGETS += sub-qdoc3 adp_docs qch_docs docs docs_zh_CN docs_ja_JP +QMAKE_EXTRA_TARGETS += sub-qdoc3 adp_docs dita_docs qch_docs docs docs_zh_CN docs_ja_JP INSTALLS += htmldocs qchdocs docimages examplesmanifest demosmanifest |