Commit cee04d9a authored by Oswald Buddenhagen's avatar Oswald Buddenhagen

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: default avatarJerome Pasion <jerome.pasion@digia.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent 83da9cf6
...@@ -7,23 +7,23 @@ imagedirs = $SRCDIR/images $SRCDIR/templates/images ...@@ -7,23 +7,23 @@ imagedirs = $SRCDIR/images $SRCDIR/templates/images
outputdir = $OUTDIR outputdir = $OUTDIR
exampledirs = $SRCDIR/examples \ exampledirs = $SRCDIR/examples \
$SRCDIR/snippets $SRCDIR/snippets
indexes += $QT_INSTALL_DOCS/qtwidgets/qtwidgets.index \ indexes += $QDOC_INDEX_DIR/qtwidgets/qtwidgets.index \
$QT_INSTALL_DOCS/qtcore/qtcore.index \ $QDOC_INDEX_DIR/qtcore/qtcore.index \
$QT_INSTALL_DOCS/qtqml/qtqml.index \ $QDOC_INDEX_DIR/qtqml/qtqml.index \
$QT_INSTALL_DOCS/qtquick/qtquick.index \ $QDOC_INDEX_DIR/qtquick/qtquick.index \
$QT_INSTALL_DOCS/qmake/qmake.index \ $QDOC_INDEX_DIR/qmake/qmake.index \
$QT_INSTALL_DOCS/qtdesigner/qtdesigner.index \ $QDOC_INDEX_DIR/qtdesigner/qtdesigner.index \
$QT_INSTALL_DOCS/qtdoc/qtdoc.index \ $QDOC_INDEX_DIR/qtdoc/qtdoc.index \
$QT_INSTALL_DOCS/qtgui/qtgui.index \ $QDOC_INDEX_DIR/qtgui/qtgui.index \
$QT_INSTALL_DOCS/qthelp/qthelp.index \ $QDOC_INDEX_DIR/qthelp/qthelp.index \
$QT_INSTALL_DOCS/qtquickcontrols/qtquickcontrols.index \ $QDOC_INDEX_DIR/qtquickcontrols/qtquickcontrols.index \
$QT_INSTALL_DOCS/qtquicklayouts/qtquicklayouts.index \ $QDOC_INDEX_DIR/qtquicklayouts/qtquicklayouts.index \
$QT_INSTALL_DOCS/qtlinguist/qtlinguist.index \ $QDOC_INDEX_DIR/qtlinguist/qtlinguist.index \
$QT_INSTALL_DOCS/qtscript/qtscript.index \ $QDOC_INDEX_DIR/qtscript/qtscript.index \
$QT_INSTALL_DOCS/qtsensors/qtsensors.index \ $QDOC_INDEX_DIR/qtsensors/qtsensors.index \
$QT_INSTALL_DOCS/qtuitools/qtuitools.index \ $QDOC_INDEX_DIR/qtuitools/qtuitools.index \
$QT_INSTALL_DOCS/qtwebkit/qtwebkit.index \ $QDOC_INDEX_DIR/qtwebkit/qtwebkit.index \
$QT_INSTALL_DOCS/qtxml/qtxml.index $QDOC_INDEX_DIR/qtxml/qtxml.index
include(macros.qdocconf) include(macros.qdocconf)
include(qt-cpp-ignore.qdocconf) include(qt-cpp-ignore.qdocconf)
......
greaterThan(QT_MAJOR_VERSION, 4) { greaterThan(QT_MAJOR_VERSION, 4) {
HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) -platform minimal HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) -platform minimal
QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc) QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc)
QDOC_GLOBAL = QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS/src] QDOC_INDEX_DIR=$$[QT_INSTALL_DOCS]
COMPAT = COMPAT =
} else { } else {
HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator)
QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc3) 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 COMPAT = -qt4
} }
...@@ -23,7 +25,7 @@ defineReplace(cmdEnv) { ...@@ -23,7 +25,7 @@ defineReplace(cmdEnv) {
} }
defineReplace(qdoc) { 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 QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment