make use of $$[FOO/get] properties

this cleans up a lot of hacks supporting the build of qt, including the
last bits of $QTDIR.

Change-Id: Id119886ed8097967dad6cf86ebd4e71d90c42841
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf
index ccf13b5..4377542 100644 (file)
--- a/mkspecs/features/device_config.prf
+++ b/mkspecs/features/device_config.prf
@@ -1,35 +1,13 @@
 # Load generated qdevice.pri
-exists($$_QMAKE_CACHE_) {
-    # set in default_pre, so it's the first place to check for qdevice.pri
-    DIR = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE)
-    !isEmpty(DIR):DEVICE_PRI = $$DIR/mkspecs/qdevice.pri
-}
-
-isEmpty(DEVICE_PRI) {
-    # OUTDIR environ is set by configure (arch detection) and compile.test
-    DIR = $$(OUTDIR)
-    !isEmpty(DIR):DEVICE_PRI = $$DIR/mkspecs/qdevice.pri
-}
-
-isEmpty(DEVICE_PRI) {
-    DIR = $$[QT_HOST_DATA]
-    !isEmpty(DIR):DEVICE_PRI = $$DIR/mkspecs/qdevice.pri
-}
-
-isEmpty(DEVICE_PRI) {
-    error(Could not locate qdevice.pri)
-}
-
+DEVICE_PRI = $$[QMAKE_HOST_DATA/get]/mkspecs/qdevice.pri
 exists($$DEVICE_PRI):include($$DEVICE_PRI)
+unset(DEVICE_PRI)
 
 isEmpty(CROSS_COMPILE) {
     #this variable can be persisted via qmake -set CROSS_COMPILE /foo
     CROSS_COMPILE = $$[CROSS_COMPILE]
 }
 
-unset(DEVICE_PRI)
-unset(DIR)
-
 # Provide a function to be used by mkspecs
 defineTest(deviceSanityCheckCompiler) {
     # Check if the binary exists with an absolute path. Do this check

diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 1912f60..9950f95 100644 (file)
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -101,7 +101,7 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
 
         # Only link against plugin in static builds
         isEqual(QT_CURRENT_VERIFY, QTPLUGIN): {
-            !isEmpty(QT_PLUGINPATH): LIBS *= -L$$[QT_INSTALL_PLUGINS]/$$QT_PLUGINPATH
+            !isEmpty(QT_PLUGINPATH): LIBS *= -L$$[QT_INSTALL_PLUGINS/get]/$$QT_PLUGINPATH
                 LIBS += $$QT_LINKAGE
             # if the plugin is linked statically there is no need to deploy it
             DEPLOYMENT_PLUGIN -= $$QT_CURRENT_VERIFY
@@ -111,7 +111,7 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
             CONFIG(debug, debug|release): QT_ITEM = $${QTPLUG}d4.dll
             else: QT_ITEM = $${QTPLUG}4.dll
 
-            eval(qt_additional_plugin_$${QTPLUG}.files = $$[QT_INSTALL_PLUGINS]/$${QT_PLUGINPATH}/$${QT_ITEM})
+            eval(qt_additional_plugin_$${QTPLUG}.files = $$[QT_INSTALL_PLUGINS/get]/$${QT_PLUGINPATH}/$${QT_ITEM})
             eval(qt_additional_plugin_$${QTPLUG}.path = $${QT_PLUGINPATH})
 
             DEPLOYMENT *= qt_additional_plugin_$${QTPLUG}

diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf
index 8d0dcce..514c018 100644 (file)
--- a/mkspecs/features/qt_config.prf
+++ b/mkspecs/features/qt_config.prf
@@ -2,21 +2,14 @@
 # Consequently, we have to do some stunts to get values out of the cache.
 
 exists($$_QMAKE_CACHE_) {
-    QMAKE_QT_CONFIG = $$fromfile($$_QMAKE_CACHE_, QMAKE_QT_CONFIG)
     QMAKE_EXTRA_MODULE_FORWARDS = $$fromfile($$_QMAKE_CACHE_, QMAKE_EXTRA_MODULE_FORWARDS)
 }
-isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) {
-   !isEmpty(QT_BUILD_TREE):QMAKE_QT_CONFIG = $$QT_BUILD_TREE
-   else:exists($$_QMAKE_CACHE_):QMAKE_QT_CONFIG = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE)
-   isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$[QT_HOST_DATA]
-   QMAKE_QT_CONFIG = $$QMAKE_QT_CONFIG/mkspecs/qconfig.pri
-}
+QMAKE_QT_CONFIG = $$[QT_HOST_DATA/get]/mkspecs/qconfig.pri
 !exists($$QMAKE_QT_CONFIG)|!include($$QMAKE_QT_CONFIG, "", true) {
    debug(1, "Cannot load qconfig.pri!")
 } else {
    debug(1, "Loaded .qconfig.pri from ($$QMAKE_QT_CONFIG)")
-   for(dir, $$list($$unique($$list($$replace($$list($$dirname(QMAKE_QT_CONFIG) \
-                                                    $$replace($$list($$split($$list($$(QMAKEPATH)), $$DIRLIST_SEPARATOR)), $, /mkspecs)), \
+   for(dir, $$list($$unique($$list($$replace($$list($$split($$list($$[QMAKE_MKSPECS]), $$DIRLIST_SEPARATOR)), \
                                              $, /modules) \
                                    $$QMAKE_EXTRA_MODULE_FORWARDS)))) {
       debug(1, "Loading modules from $${dir}")

diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index ee1647f..b6cc42f 100644 (file)
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -166,8 +166,7 @@ defineTest(qtAddModule) {
 
 # variable, default
 defineTest(qtPrepareTool) {
-    MODBASE = $$[QT_HOST_BINS]
-    !isEmpty(QT_BUILD_TREE):MODBASE = $$QT_BUILD_TREE/bin
+    MODBASE = $$[QT_HOST_BINS/get]
     count(ARGS, 2, greaterThan) {
         isEmpty(QT.$${3}.bins):warning("No QT.$${3}.bins, module path ignored for qtPrepareTool($$1, $$2, $$3)")
         else:MODBASE = $$eval(QT.$${3}.bins)

diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index b6b865b..29b088b 100644 (file)
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -1,17 +1,5 @@
-# This file is loaded on-demand, before any .qmake.cache (sometimes *in* .qmake.cache), to loaded
-# important settings for modules, such as paths to QtBase, settings etc.
-# Consequently, we have to do some stunts to figure out where to find qmodule.pri.
-
-isEmpty(QMAKE_QT_MODULE)|!exists($$QMAKE_QT_MODULE) {
-   exists($$QTDIR/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$QTDIR/mkspecs/qmodule.pri
-   QMAKE_CACHE_DIR = $$dirname(_QMAKE_CACHE_)
-   !exists($$QMAKE_QT_MODULE):exists($$QMAKE_CACHE_DIR/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$QMAKE_CACHE_DIR/mkspecs/qmodule.pri
-   !exists($$QMAKE_QT_MODULE):exists($$QMAKE_CACHE_DIR/qtbase/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$QMAKE_CACHE_DIR/qtbase/mkspecs/qmodule.pri
-   !exists($$QMAKE_QT_MODULE):if(!isEmpty(QT_BUILD_TREE) & exists($$QT_BUILD_TREE/mkspecs/qmodule.pri)):QMAKE_QT_MODULE = $$QT_BUILD_TREE/mkspecs/qmodule.pri
-   !exists($$QMAKE_QT_MODULE):exists($$[QT_HOST_DATA]/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$[QT_HOST_DATA]/mkspecs/qmodule.pri
-}
-
 !contains(QMAKE_INTERNAL_INCLUDED_FILES, .*qmodule\\.pri) {
+    QMAKE_QT_MODULE = $$[QT_HOST_DATA/get]/mkspecs/qmodule.pri
     !exists($$QMAKE_QT_MODULE)|!include($$QMAKE_QT_MODULE, "", true) {
         error("Cannot load qmodule.pri!")
     } else {

diff --git a/tests/auto/corelib/plugin/qplugin/qplugin.pro b/tests/auto/corelib/plugin/qplugin/qplugin.pro
index 37a12da..e8840a0 100644 (file)
--- a/tests/auto/corelib/plugin/qplugin/qplugin.pro
+++ b/tests/auto/corelib/plugin/qplugin/qplugin.pro
@@ -1,10 +1,10 @@
 QT = core
 TEMPLATE = subdirs
 win32 {
-    exists($$[QT_INSTALL_LIBS]/QtCore4.dll) {
+    exists($$[QT_INSTALL_LIBS/get]/QtCore4.dll) {
         SUBDIRS = releaseplugin
     }
-    exists($$[QT_INSTALL_LIBS]/QtCored4.dll) {
+    exists($$[QT_INSTALL_LIBS/get]/QtCored4.dll) {
         SUBDIRS += debugplugin
     }
 }