diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-21 09:35:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-21 09:35:37 (GMT) |
| commit | e97471c4d6294794b01c96a3f0aead2a3e6ee45f (patch) | |
| tree | aaaf6d7ebd7c8cdddcc4392551bf70f0040afe70 /doc/doc.pri | |
| parent | b5fc0b789039c425ca41dd8b466d4cbb355c886b (diff) | |
| parent | e22d40a6143709da6ee26c2f8e1b6a05904fd9b4 (diff) | |
| download | Qt-e97471c4d6294794b01c96a3f0aead2a3e6ee45f.zip Qt-e97471c4d6294794b01c96a3f0aead2a3e6ee45f.tar.gz Qt-e97471c4d6294794b01c96a3f0aead2a3e6ee45f.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: (29 commits)
Add dita_docs target to generate DITA output.
Fix missing part from commit dae052cb11c0018121f2c4028aed9db17769fd77
Fix a bug where 'int' is not printed in snippets.
SSL: fix build with -openssl-linked for OpenSSL 0.9.8*
Fix m_longTapDetector causing crash.
Fixes to czech translation
Fix crash in positionInLigature
Fix to incorrect ApplicationActivate event in QtOpenGL
Symbian - Fix QFile::map with non page aligned offsets
Update czech translation
Symbian: fix tst_QMenuBar::task256322_highlight() regression
I18n: Updates galician translation (4.8)
Fix Memoy leak relateded to contextmenu.
Set execution bits for .test files.
Default to QDir::homePath() in Symbian native file dialogs
directfb: Backport the work from QtBase to Qt 4.8
[blitter] Work on tst_QPixmap::clear()
[blitter] Use QScopedPointer for the engine and blittable
[blitter] Generate a new serial number when resizing the
[blitter] Fix memory leak in the blitter paintengine
...
Diffstat (limited to 'doc/doc.pri')
| -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 |