diff options
| author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2011-11-17 17:51:26 (GMT) |
|---|---|---|
| committer | Daniel Molkentin <daniel.molkentin@nokia.com> | 2011-11-21 12:50:12 (GMT) |
| commit | 002a9f1868be72c5d18a0568c77c7dc1d06de010 (patch) | |
| tree | d0b84baf0705ffe12c0b5a6ff94415a801ca1302 /doc | |
| parent | e9f850d4cfc6ac6f125481d0d92509713534896a (diff) | |
| download | Qt-002a9f1868be72c5d18a0568c77c7dc1d06de010.zip Qt-002a9f1868be72c5d18a0568c77c7dc1d06de010.tar.gz Qt-002a9f1868be72c5d18a0568c77c7dc1d06de010.tar.bz2 | |
Doc: Copy manifest files to the places where Creator expects them.
Reviewed-by: Casper van Donderen
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc.pri | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index 9d67386..38d3d16 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -17,6 +17,9 @@ COPYWEBKITGUIDE = $$QT_SOURCE_TREE/examples/webkit/webkit-guide COPYWEBKITTARGA = $$QT_BUILD_TREE/doc-build/html-qt COPYWEBKITTARGB = $$QT_BUILD_TREE/doc/html +EXAMPLESMANIFEST = $$QT_BUILD_TREE/doc/html/examples-manifest.xml +DEMOSMANIFEST = $$QT_BUILD_TREE/doc/html/demos-manifest.xml + $$unixstyle { QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QT_BUILD_TREE/bin/qdoc3 $$DOCS_GENERATION_DEFINES } else { @@ -31,6 +34,8 @@ QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdoc linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \ (cd $$QT_BUILD_TREE && \ $$QMAKE_COPY_DIR $$COPYWEBKITGUIDE $$COPYWEBKITTARGA && \ + $$QMAKE_COPY $$EXAMPLESMANIFEST $$QT_BUILD_TREE/examples && \ + $$QMAKE_COPY $$DEMOSMANIFEST $$QT_BUILD_TREE/demos && \ $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \ $$GENERATOR doc-build/html-assistant/assistant.qhp -o doc/qch/assistant.qch && \ $$GENERATOR doc-build/html-designer/designer.qhp -o doc/qch/designer.qch && \ @@ -74,6 +79,14 @@ htmldocs.files = $$QT_BUILD_TREE/doc/html htmldocs.path = $$[QT_INSTALL_DOCS] htmldocs.CONFIG += no_check_exist directory +examplesmanifest.files = $$EXAMPLESMANIFEST +examplesmanifest.path = $$[QT_INSTALL_EXAMPLES] +examplesmanifest.CONFIG += no_check_exist directory + +demosmanifest.files = $$DEMOSMANIFEST +demosmanifest.path = $$[QT_INSTALL_DEMOS] +demosmanifest.CONFIG += no_check_exist directory + qchdocs.files= $$QT_BUILD_TREE/doc/qch qchdocs.path = $$[QT_INSTALL_DOCS] qchdocs.CONFIG += no_check_exist directory @@ -85,4 +98,4 @@ 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 -INSTALLS += htmldocs qchdocs docimages +INSTALLS += htmldocs qchdocs docimages examplesmanifest demosmanifest |