diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-05-22 12:11:37 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-05-27 10:12:52 +0200 |
| commit | cee04d9ac677c03180ec1d6786ef64afd56bc99f (patch) | |
| tree | d0301a45c2cd7241861826185b6349a9b9d36b3e /doc/doc.pri | |
| parent | 83da9cf6e3027f0a42da30b85e81a52fc47bdd0c (diff) | |
fix building against non-installed qt5 shadow builds
the global qdoc configs may live in the source dir, but the indexes are
always in the build dir.
this will obviously only work for a non-prefix (developer) build of qt,
as a non-installed prefix build is not usable from the outside.
Task-number: QTCREATORBUG-11919
Change-Id: I268af2f075a098ac5fe788a2f85c754dc6e4e8b0
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'doc/doc.pri')
| -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 8181e059c9..c97bf0a02d 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -1,10 +1,12 @@ greaterThan(QT_MAJOR_VERSION, 4) { HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) -platform minimal QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc) + QDOC_GLOBAL = QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS/src] QDOC_INDEX_DIR=$$[QT_INSTALL_DOCS] COMPAT = } else { HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc3) + QDOC_GLOBAL = QDOC_INDEX_DIR=dummy # this will be ignored. we don't link qt4 docs any more. COMPAT = -qt4 } @@ -23,7 +25,7 @@ defineReplace(cmdEnv) { } defineReplace(qdoc) { - return("$$cmdEnv(SRCDIR=$$PWD OUTDIR=$$1 QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG QTC_LICENSE_TYPE=$$LICENSE_TYPE QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS]) $$QDOC_BIN") + return("$$cmdEnv(SRCDIR=$$PWD OUTDIR=$$1 QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG QTC_LICENSE_TYPE=$$LICENSE_TYPE $$QDOC_GLOBAL) $$QDOC_BIN") } QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp |