summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/qt_build_paths.prf
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-01-31 18:55:53 +0100
committerSergio Ahumada <sergio.ahumada@digia.com>2013-01-31 18:55:53 +0100
commit6239af6f0f15871e02a516c97c5f1775743d352b (patch)
tree904e3e5df8c6f3e4aa820db4f2d9e73e3026dfd4 /mkspecs/features/qt_build_paths.prf
parent3dc47622a469ded1c99397fdedc2053b73d57189 (diff)
parent6654a05fcad565a302e205e7f7deaa0b2757082d (diff)
Merge branch 'release' into stable
Diffstat (limited to 'mkspecs/features/qt_build_paths.prf')
-rw-r--r--mkspecs/features/qt_build_paths.prf4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf
index 123c87de3b..03b43e3153 100644
--- a/mkspecs/features/qt_build_paths.prf
+++ b/mkspecs/features/qt_build_paths.prf
@@ -16,8 +16,8 @@ isEmpty(MODULE_BASE_DIR): MODULE_BASE_DIR = $$MODULE_PROFILE_DIR
isEmpty(MODULE_BASE_OUTDIR): MODULE_BASE_OUTDIR = $$shadowed($$MODULE_BASE_DIR)
isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$MODULE_BASE_OUTDIR
-QTDIR = $$[QT_HOST_PREFIX]
-exists($$QTDIR/.qmake.cache) {
+!prefix_build {
+ QTDIR = $$[QT_HOST_PREFIX]
# Permit modules to enforce being built outside QTDIR ...
!force_independent: MODULE_BASE_OUTDIR = $$QTDIR
# ... though this sort of breaks the idea.