diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-21 17:04:03 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-21 17:04:32 +0100 |
| commit | 3d9fc71e899702fff6124351cf0d5b1fa0c07b41 (patch) | |
| tree | a9b8eb1ca5fd45c7f9ffb4a92588e2fa6a294443 /doc | |
| parent | 7e9b2651d0bba127ab8197ffa1ddbd5805a211d2 (diff) | |
| parent | 3fb931187386aadd4329e763b8a276ee0bc5ab77 (diff) | |
Merge remote-tracking branch 'origin/1.3'
Change-Id: Ibe38be81d8e763fb58899e2594641b8b062c5504
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc.pri | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index 8c3a9f208..a460b3b3a 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -9,11 +9,16 @@ win32:QDOC_BIN = $$replace(QDOC_BIN, "/", "\\") IFW_VERSION_TAG = $$replace(IFW_VERSION, "[-.]", ) +defineReplace(cmdEnv) { + !equals(QMAKE_DIR_SEP, /): 1 ~= s,^(.*)$,(set \\1) &&,g + return("$$1") +} + +QDOC = $$cmdEnv(SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html IFW_VERSION=$$IFW_VERSION IFW_VERSION_TAG=$$IFW_VERSION_TAG QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS]) $$QDOC_BIN + unix { - QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html IFW_VERSION=$$IFW_VERSION IFW_VERSION_TAG=$$IFW_VERSION_TAG $$QDOC_BIN HELPGENERATOR = $$[QT_INSTALL_BINS]/qhelpgenerator } else { - QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& set IFW_VERSION=$$IFW_VERSION&& setIFW_VERSION_TAG=$$IFW_VERSION_TAG&& $$QDOC_BIN # Always run qhelpgenerator inside its own cmd; this is a workaround for # an unusual bug which causes qhelpgenerator.exe to do nothing HELPGENERATOR = cmd /C $$replace($$list($$[QT_INSTALL_BINS]/qhelpgenerator.exe), "/", "\\") @@ -47,19 +52,11 @@ HELP_DEP_FILES = $$PWD/installerfw.qdoc \ $$PWD/config/qt-html-templates-online.qdocconf \ $$PWD/config/qt-html-templates.qdocconf -unix { html_docs.commands = $$QDOC $$PWD/installerfw.qdocconf -} else { -html_docs.commands = \"$$QDOC $$PWD/installerfw.qdocconf\" -} html_docs.depends += $$HELP_DEP_FILES html_docs.files = $$QHP_FILE -unix { html_docs_online.commands = $$QDOC $$PWD/installerfw-online.qdocconf -} else { -html_docs_online.commands = \"$$QDOC $$PWD/installerfw-online.qdocconf\" -} html_docs_online.depends += $$HELP_DEP_FILES html_docs_online.files = $$QHP_FILE |