diff options
| author | Fabien Freling <fabien.freling@nokia.com> | 2010-02-12 15:49:38 (GMT) |
|---|---|---|
| committer | Fabien Freling <fabien.freling@nokia.com> | 2010-02-12 15:49:38 (GMT) |
| commit | c04fd421375562f2db8ab89d7bb9509d9b655dd2 (patch) | |
| tree | 411853760626883241748157b8e3dca1b272722f /doc/doc.pri | |
| parent | 441aff9d01a1530d2b187098c7c47bc683116a66 (diff) | |
| parent | 3fb70a8beea1dda58e50831edc5dd9073b899f72 (diff) | |
| download | Qt-c04fd421375562f2db8ab89d7bb9509d9b655dd2.zip Qt-c04fd421375562f2db8ab89d7bb9509d9b655dd2.tar.gz Qt-c04fd421375562f2db8ab89d7bb9509d9b655dd2.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'doc/doc.pri')
| -rw-r--r-- | doc/doc.pri | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index 463c447..ccbef1a 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -30,8 +30,14 @@ QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdoc $$GENERATOR doc-build/html-qmake/qmake.qhp -o doc/qch/qmake.qch \ ) +QT_ZH_CN_DOCUMENTATION = ($$QDOC qt-api-only_zh_CN.qdocconf) && \ + (cd $$QT_BUILD_TREE && \ + $$GENERATOR doc-build/html-qt_zh_CN/qt.qhp -o doc/qch/qt_zh_CN.qch \ + ) + win32-g++:isEmpty(QMAKE_SH) { QT_DOCUMENTATION = $$replace(QT_DOCUMENTATION, "/", "\\\\") + QT_ZH_CN_DOCUMENTATION = $$replace(QT_ZH_CN_DOCUMENTATION, "/", "\\\\") } # Build rules: @@ -42,6 +48,9 @@ qch_docs.depends += sub-tools docs.depends = adp_docs qch_docs +docs_zh_CN.depends = docs +docs_zh_CN.commands = $$QT_ZH_CN_DOCUMENTATION + # Install rules htmldocs.files = $$QT_BUILD_TREE/doc/html htmldocs.path = $$[QT_INSTALL_DOCS] @@ -54,5 +63,5 @@ 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 +QMAKE_EXTRA_TARGETS += qdoc adp_docs qch_docs docs docs_zh_CN INSTALLS += htmldocs qchdocs docimages |