diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-03-04 14:22:27 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-03-04 14:22:27 (GMT) |
| commit | c3d5e6703777f294e5af12a0871defd339f1c1ff (patch) | |
| tree | 7bf4bd3416cda1f6f677590efce6f9aec2138721 /doc | |
| parent | 4b3953678983b3da925066f464b55340fab3503c (diff) | |
| parent | a0cb1ae902dce0c00dc2de8b92229d66945054c8 (diff) | |
| download | Qt-c3d5e6703777f294e5af12a0871defd339f1c1ff.zip Qt-c3d5e6703777f294e5af12a0871defd339f1c1ff.tar.gz Qt-c3d5e6703777f294e5af12a0871defd339f1c1ff.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc')
| -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 |