diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-23 14:34:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-23 14:34:53 (GMT) |
| commit | d1b07c00bf5ca50b33607898eb0d3948f7a14403 (patch) | |
| tree | a2f696c96f7041a4ff9aaea81b1a2504c4f9701c /doc | |
| parent | 05ba0b4d0d32ea2a823aee0b5d196008d95a021d (diff) | |
| parent | dd26f80efaf5276e12896a12f1d186822bc86067 (diff) | |
| download | Qt-d1b07c00bf5ca50b33607898eb0d3948f7a14403.zip Qt-d1b07c00bf5ca50b33607898eb0d3948f7a14403.tar.gz Qt-d1b07c00bf5ca50b33607898eb0d3948f7a14403.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fix manifest install rule on windows
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc.pri | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index 38d3d16..2480b07 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -19,6 +19,8 @@ COPYWEBKITTARGB = $$QT_BUILD_TREE/doc/html EXAMPLESMANIFEST = $$QT_BUILD_TREE/doc/html/examples-manifest.xml DEMOSMANIFEST = $$QT_BUILD_TREE/doc/html/demos-manifest.xml +EXAMPLESMANIFESTTARGET = $$QT_BUILD_TREE/examples +DEMOSMANIFESTTARGET = $$QT_BUILD_TREE/demos $$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 @@ -28,14 +30,18 @@ $$unixstyle { COPYWEBKITGUIDE = $$replace(COPYWEBKITGUIDE, "/", "\\") COPYWEBKITTARGA = $$replace(COPYWEBKITTARGA, "/", "\\") COPYWEBKITTARGB = $$replace(COPYWEBKITTARGB, "/", "\\") + EXAMPLESMANIFEST = $$replace(EXAMPLESMANIFEST, "/", "\\")) + DEMOSMANIFEST = $$replace(DEMOSMANIFEST, "/", "\\")) + EXAMPLESMANIFESTTARGET = $$replace(EXAMPLESMANIFESTTARGET, "/", "\\")) + DEMOSMANIFESTTARGET = $$replace(DEMOSMANIFESTTARGET, "/", "\\")) } ADP_DOCS_QDOCCONF_FILE = qt-build-docs-online.qdocconf QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ 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 && \ + $$QMAKE_COPY $$EXAMPLESMANIFEST $$EXAMPLESMANIFESTTARGET && \ + $$QMAKE_COPY $$DEMOSMANIFEST $$DEMOSMANIFESTTARGET && \ $$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 && \ |