diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-07 13:27:41 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-07 13:27:41 (GMT) |
| commit | 1c79d97f8130a0c00f4c57535d85bdb4246eeb4d (patch) | |
| tree | 3842506134728d52e9b0340d2fdd50b2d7e0cace /doc/doc.pri | |
| parent | 2b4d2fd1ada524f4780dd7633ca34bc72d823ff1 (diff) | |
| parent | eba8e2c10c5bc1b373fdf7640962029cb2e7908f (diff) | |
| download | Qt-1c79d97f8130a0c00f4c57535d85bdb4246eeb4d.zip Qt-1c79d97f8130a0c00f4c57535d85bdb4246eeb4d.tar.gz Qt-1c79d97f8130a0c00f4c57535d85bdb4246eeb4d.tar.bz2 | |
Merge commit 'refs/merge-requests/2408' of git://gitorious.org/qt/qt into integration
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 3180a61..0a5cc9a 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -36,9 +36,15 @@ QT_ZH_CN_DOCUMENTATION = ($$QDOC qt-api-only_zh_CN.qdocconf) && \ $$GENERATOR doc-build/html-qt_zh_CN/qt.qhp -o doc/qch/qt_zh_CN.qch \ ) +QT_JA_JP_DOCUMENTATION = ($$QDOC qt-api-only_ja_JP.qdocconf) && \ + (cd $$QT_BUILD_TREE && \ + $$GENERATOR doc-build/html-qt_ja_JP/qt.qhp -o doc/qch/qt_ja_JP.qch \ + ) + win32-g++:isEmpty(QMAKE_SH) { QT_DOCUMENTATION = $$replace(QT_DOCUMENTATION, "/", "\\\\") QT_ZH_CN_DOCUMENTATION = $$replace(QT_ZH_CN_DOCUMENTATION, "/", "\\\\") + QT_JA_JP_DOCUMENTATION = $$replace(QT_JA_JP_DOCUMENTATION, "/", "\\\\") } # Build rules: @@ -52,6 +58,9 @@ docs.depends = sub-qdoc3 adp_docs qch_docs docs_zh_CN.depends = docs docs_zh_CN.commands = $$QT_ZH_CN_DOCUMENTATION +docs_ja_JP.depends = docs +docs_ja_JP.commands = $$QT_JA_JP_DOCUMENTATION + # Install rules htmldocs.files = $$QT_BUILD_TREE/doc/html htmldocs.path = $$[QT_INSTALL_DOCS] @@ -67,5 +76,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 +QMAKE_EXTRA_TARGETS += sub-qdoc3 adp_docs qch_docs docs docs_zh_CN docs_ja_JP INSTALLS += htmldocs qchdocs docimages |