don't set QT_BUILD_DIR as a side effect

we would be setting QT_BUILD_DIR to $$[QT_INSTALL_DATA] as a fallback, which would make qtPrepareTool() believe we were doing a qt build despite actually trying to build something against an installed qt. this would become apparent only when using a non-default directory layout, as is the case in our mac packages. Change-Id: I4f27e9427222ad3b9bb83fcc625bab19e00db9be Reviewed-by: Miikka Heikkinen <[email protected]> Reviewed-by: Teemu Katajisto <[email protected]> Reviewed-by: Joerg Bornemann <[email protected]>
PaPaNebo · Oct 30, 2012 · b997b88 · b997b88
1 parent 3e0b059
commit b997b88
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf
@@ -1,8 +1,9 @@
 # Load generated qdevice.pri
-isEmpty(QT_BUILD_TREE):exists($$_QMAKE_CACHE_): QT_BUILD_TREE = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE)
-isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = $$[QT_INSTALL_DATA]
-
-DEVICE_PRI = $$QT_BUILD_TREE/mkspecs/qdevice.pri
+qdd = $$QT_BUILD_TREE
+isEmpty(qdd):exists($$_QMAKE_CACHE_): qdd = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE)
+isEmpty(qdd): qdd = $$[QT_INSTALL_DATA]
+DEVICE_PRI = $$qdd/mkspecs/qdevice.pri
+unset(qdd)
 
 exists($$DEVICE_PRI):include($$DEVICE_PRI)
 unset(DEVICE_PRI)

diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf
@@ -3,9 +3,11 @@
 
 exists($$_QMAKE_CACHE_):QMAKE_QT_CONFIG = $$fromfile($$_QMAKE_CACHE_, QMAKE_QT_CONFIG)
 isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) {
-   isEmpty(QT_BUILD_TREE):exists($$_QMAKE_CACHE_): QT_BUILD_TREE = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE)
-   isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = $$[QT_INSTALL_DATA]
-   QMAKE_QT_CONFIG = $$QT_BUILD_TREE/mkspecs/qconfig.pri
+   qdd = $$QT_BUILD_TREE
+   isEmpty(qdd):exists($$_QMAKE_CACHE_): qdd = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE)
+   isEmpty(qdd): qdd = $$[QT_INSTALL_DATA]
+   QMAKE_QT_CONFIG = $$qdd/mkspecs/qconfig.pri
+   unset(qdd)
 }
 !include($$QMAKE_QT_CONFIG, "", true) {
    debug(1, "Cannot load qconfig.pri!")