diff options
| author | Martin Smith <martin.smith@nokia.com> | 2011-04-07 08:00:10 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2011-04-07 08:00:10 (GMT) |
| commit | 078f18b3de857978ad42ccbcbdc5e40dd8d0159f (patch) | |
| tree | bb6f5641f20cd2581f183b352dfe5050e4f08e2b | |
| parent | 90de2bb100b2f4a23655b2e914b93c644f1a4841 (diff) | |
| parent | 214751c5e7d7af6770cbd36a431d8f718c3041e1 (diff) | |
| download | Qt-078f18b3de857978ad42ccbcbdc5e40dd8d0159f.zip Qt-078f18b3de857978ad42ccbcbdc5e40dd8d0159f.tar.gz Qt-078f18b3de857978ad42ccbcbdc5e40dd8d0159f.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
| -rw-r--r-- | doc/doc.pri | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index 68d729b..253e1b4 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -13,12 +13,14 @@ win32:!win32-g++* { unixstyle = true } +COPYWEBKITGUIDE = $$QT_SOURCE_TREE/examples/webkit/webkit-guide + $$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 - COPYWEBKITGUIDE = $$QT_SOURCE_TREE/examples/webkit/webkit-guide } else { QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QT_BUILD_TREE/bin/qdoc3.exe $$DOCS_GENERATION_DEFINES QDOC = $$replace(QDOC, "/", "\\") + COPYWEBKITGUIDE = $$replace(COPYWEBKITGUIDE, "/", "\\") } ADP_DOCS_QDOCCONF_FILE = qt-build-docs-online.qdocconf QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ |