diff options
author | David Boddie <dboddie@trolltech.com> | 2010-03-04 18:22:02 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2010-03-04 18:22:02 (GMT) |
commit | 2542f8b565e90378145c048b3a6982f4749c6392 (patch) | |
tree | d48a2a8988a778e16cf73aac4d0b5709b82f0082 /doc/doc.pri | |
parent | 4f2203e481cc1663776e7b87b082cf0dd42849fd (diff) | |
parent | 364ba2bfeeab574d2ae940e4387d3c90b2a46dcd (diff) | |
download | Qt-2542f8b565e90378145c048b3a6982f4749c6392.zip Qt-2542f8b565e90378145c048b3a6982f4749c6392.tar.gz Qt-2542f8b565e90378145c048b3a6982f4749c6392.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc/doc.pri')
-rw-r--r-- | doc/doc.pri | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index aea5b08..3d04049 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -43,11 +43,11 @@ win32-g++:isEmpty(QMAKE_SH) { # Build rules: adp_docs.commands = ($$QDOC $$ADP_DOCS_QDOCCONF_FILE) -adp_docs.depends += sub-tools # qdoc3 +adp_docs.depends += sub-qdoc3 # qdoc3 qch_docs.commands = $$QT_DOCUMENTATION -qch_docs.depends += sub-tools +qch_docs.depends += sub-qdoc3 -docs.depends = adp_docs qch_docs +docs.depends = sub-qdoc3 adp_docs qch_docs docs_zh_CN.depends = docs docs_zh_CN.commands = $$QT_ZH_CN_DOCUMENTATION @@ -64,5 +64,8 @@ qchdocs.CONFIG += no_check_exist docimages.files = $$QT_BUILD_TREE/doc/src/images docimages.path = $$[QT_INSTALL_DOCS]/src -QMAKE_EXTRA_TARGETS += qdoc adp_docs qch_docs docs docs_zh_CN +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 INSTALLS += htmldocs qchdocs docimages |