diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-01-25 22:14:17 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-05 12:38:24 +0100 |
| commit | 89efd76c2c710df5886e94ac34eb40f47b619fb9 (patch) | |
| tree | 93c0c042ef762e64593f6984c7eaa5f1c33f371f /doc/doc.pri | |
| parent | 79e8f885365d47eb968cca5873a36c6d46532e1f (diff) | |
de-duplicate qdoc command construction
Change-Id: I83de381cbbee9a04432aeccbb202a13f746ef97e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'doc/doc.pri')
| -rw-r--r-- | doc/doc.pri | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index 97d4c3055e..8a970a38f1 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -13,20 +13,13 @@ VERSION_TAG = $$replace(QTCREATOR_VERSION, "[-.]", ) # of URLs for the links to the Qt documentation QMAKE_DOCS_INSTALLDIR = +defineReplace(cmdEnv) { + !equals(QMAKE_DIR_SEP, /): 1 ~= s,^(.*)$,(set \\1) &&,g + return("$$1") +} + defineReplace(qdoc) { - equals(QMAKE_DIR_SEP, /) { # unix, mingw+msys - QDOC = SRCDIR=$$PWD OUTDIR=$$1 QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG $$QDOC_BIN - } else:win32-g++* { # just mingw - # The lack of spaces in front of the && is necessary! - QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$1&& set QTC_VERSION=$$QTCREATOR_VERSION&& set QTC_VERSION_TAG=$$VERSION_TAG&& $$QDOC_BIN - } else { # nmake - QDOC = set SRCDIR=$$PWD $$escape_expand(\\n\\t) \ - set OUTDIR=$$1 $$escape_expand(\\n\\t) \ - set QTC_VERSION=$$QTCREATOR_VERSION $$escape_expand(\\n\\t) \ - set QTC_VERSION_TAG=$$VERSION_TAG $$escape_expand(\\n\\t) \ - $$QDOC_BIN - } - return($$QDOC) + return("$$cmdEnv(SRCDIR=$$PWD OUTDIR=$$1 QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG) $$QDOC_BIN") } QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp |