summaryrefslogtreecommitdiff
path: root/doc/config
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-05-22 12:11:37 +0200
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-05-27 10:12:52 +0200
commitcee04d9ac677c03180ec1d6786ef64afd56bc99f (patch)
treed0301a45c2cd7241861826185b6349a9b9d36b3e /doc/config
parent83da9cf6e3027f0a42da30b85e81a52fc47bdd0c (diff)
downloadqt-creator-cee04d9ac677c03180ec1d6786ef64afd56bc99f.tar.gz
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/config')
-rw-r--r--doc/config/qtcreator-project.qdocconf34
1 files changed, 17 insertions, 17 deletions
diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf
index e73ab8ba1f..424258f2f1 100644
--- a/doc/config/qtcreator-project.qdocconf
+++ b/doc/config/qtcreator-project.qdocconf
@@ -7,23 +7,23 @@ imagedirs = $SRCDIR/images $SRCDIR/templates/images
outputdir = $OUTDIR
exampledirs = $SRCDIR/examples \
$SRCDIR/snippets
-indexes += $QT_INSTALL_DOCS/qtwidgets/qtwidgets.index \
- $QT_INSTALL_DOCS/qtcore/qtcore.index \
- $QT_INSTALL_DOCS/qtqml/qtqml.index \
- $QT_INSTALL_DOCS/qtquick/qtquick.index \
- $QT_INSTALL_DOCS/qmake/qmake.index \
- $QT_INSTALL_DOCS/qtdesigner/qtdesigner.index \
- $QT_INSTALL_DOCS/qtdoc/qtdoc.index \
- $QT_INSTALL_DOCS/qtgui/qtgui.index \
- $QT_INSTALL_DOCS/qthelp/qthelp.index \
- $QT_INSTALL_DOCS/qtquickcontrols/qtquickcontrols.index \
- $QT_INSTALL_DOCS/qtquicklayouts/qtquicklayouts.index \
- $QT_INSTALL_DOCS/qtlinguist/qtlinguist.index \
- $QT_INSTALL_DOCS/qtscript/qtscript.index \
- $QT_INSTALL_DOCS/qtsensors/qtsensors.index \
- $QT_INSTALL_DOCS/qtuitools/qtuitools.index \
- $QT_INSTALL_DOCS/qtwebkit/qtwebkit.index \
- $QT_INSTALL_DOCS/qtxml/qtxml.index
+indexes += $QDOC_INDEX_DIR/qtwidgets/qtwidgets.index \
+ $QDOC_INDEX_DIR/qtcore/qtcore.index \
+ $QDOC_INDEX_DIR/qtqml/qtqml.index \
+ $QDOC_INDEX_DIR/qtquick/qtquick.index \
+ $QDOC_INDEX_DIR/qmake/qmake.index \
+ $QDOC_INDEX_DIR/qtdesigner/qtdesigner.index \
+ $QDOC_INDEX_DIR/qtdoc/qtdoc.index \
+ $QDOC_INDEX_DIR/qtgui/qtgui.index \
+ $QDOC_INDEX_DIR/qthelp/qthelp.index \
+ $QDOC_INDEX_DIR/qtquickcontrols/qtquickcontrols.index \
+ $QDOC_INDEX_DIR/qtquicklayouts/qtquicklayouts.index \
+ $QDOC_INDEX_DIR/qtlinguist/qtlinguist.index \
+ $QDOC_INDEX_DIR/qtscript/qtscript.index \
+ $QDOC_INDEX_DIR/qtsensors/qtsensors.index \
+ $QDOC_INDEX_DIR/qtuitools/qtuitools.index \
+ $QDOC_INDEX_DIR/qtwebkit/qtwebkit.index \
+ $QDOC_INDEX_DIR/qtxml/qtxml.index
include(macros.qdocconf)
include(qt-cpp-ignore.qdocconf)