From f2e39c4a154b109b9308ab657a1ce64cff6ab176 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Mon, 9 Jan 2017 15:44:30 +0100
Subject: inline "committing" of configure command line built-ins

the options may need to take effect before the regular test processing
commences (which is actually going to be the case in the next commit).
the indirection via the callback only obfuscated the code anyway.

Change-Id: I5307b0be15cf4cc2c2db391ce5b5a93f81076b5c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/data/configure.json |  7 -------
 mkspecs/features/qt_configure.prf    | 19 ++++++-------------
 2 files changed, 6 insertions(+), 20 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/data/configure.json b/mkspecs/features/data/configure.json
index 8e5ff5f0a4..98ccde1ee3 100644
--- a/mkspecs/features/data/configure.json
+++ b/mkspecs/features/data/configure.json
@@ -14,12 +14,5 @@
 
             "redo": { "type": "redo" }
         }
-
-    },
-
-    "features": {
-        "builtins": {
-            "output": [ "builtins" ]
-        }
     }
 }
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index a0948dad86..5e444f62b2 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -1601,19 +1601,6 @@ defineTest(qtConfOutput_privateFeature) {
     }
 }
 
-# command line built-ins post-processing
-defineTest(qtConfOutput_builtins) {
-    QMAKE_CONFIG_VERBOSE = $$eval(config.input.verbose)
-    isEmpty(QMAKE_CONFIG_VERBOSE): \
-        QMAKE_CONFIG_VERBOSE = false
-    export(QMAKE_CONFIG_VERBOSE)
-
-    QMAKE_CONFIG_CACHE_USE = $$eval(config.input.cache_use)
-    isEmpty(QMAKE_CONFIG_CACHE_USE): \
-        QMAKE_CONFIG_CACHE_USE = all
-    export(QMAKE_CONFIG_CACHE_USE)
-}
-
 defineTest(qtConfProcessOneOutput) {
     feature = $${1}
     fpfx = $${currentConfig}.features.$${feature}
@@ -1786,6 +1773,9 @@ qtConfCheckErrors()
     QMAKE_CONFIG_CACHE = $$dirname(_QMAKE_SUPER_CACHE_)/config.cache
 else: \
     QMAKE_CONFIG_CACHE = $$dirname(_QMAKE_CACHE_)/config.cache
+QMAKE_CONFIG_CACHE_USE = $$eval(config.input.cache_use)
+isEmpty(QMAKE_CONFIG_CACHE_USE): \
+    QMAKE_CONFIG_CACHE_USE = all
 !equals(QMAKE_CONFIG_CACHE_USE, none) {
     include($$QMAKE_CONFIG_CACHE, , true)
     # this crudely determines when to discard the cache. this also catches the case
@@ -1800,6 +1790,9 @@ equals(QMAKE_CONFIG_CACHE_USE, none) {
     write_file($$QMAKE_CONFIG_CACHE, cont)
 }
 
+QMAKE_CONFIG_VERBOSE = $$eval(config.input.verbose)
+isEmpty(QMAKE_CONFIG_VERBOSE): \
+    QMAKE_CONFIG_VERBOSE = false
 QMAKE_CONFIG_LOG = $$OUT_PWD/config.log
 !equals(QMAKE_CONFIG_CACHE_USE, all): \
     write_file($$QMAKE_CONFIG_LOG, "")
-- 
cgit v1.2.3