From d10c4f08d46cfe457e0e802b4f654f7911155cb0 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Thu, 27 Oct 2016 01:36:01 -0700
Subject: Be more robust about ensuring that device and simulator are set

These CONFIG entries are also needed during configure, and preemptively
fixes build errors uncovered by an upcoming forward merge, due to code
restructuring.

Change-Id: I39ae5e0f24bbd43dd3c04225d42cce4edd199094
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 mkspecs/features/uikit/default_pre.prf | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/uikit/default_pre.prf b/mkspecs/features/uikit/default_pre.prf
index b6974388ce..ecc3b9d3ab 100644
--- a/mkspecs/features/uikit/default_pre.prf
+++ b/mkspecs/features/uikit/default_pre.prf
@@ -1,20 +1,23 @@
+sim_and_dev = false
+!isEmpty(QT_VERSION):qtConfig(simulator_and_device): \
+    sim_and_dev = true
 
-!isEmpty(QT_VERSION) {
-    qtConfig(simulator_and_device)|contains(QMAKE_MAC_SDK, ^$${device.sdk}.*): \
-        CONFIG += device $${device.sdk}
-    qtConfig(simulator_and_device)|contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*): \
-        CONFIG += simulator $${simulator.sdk}
+$$sim_and_dev|contains(QMAKE_MAC_SDK, ^$${device.sdk}.*): \
+    CONFIG += device $${device.sdk}
+$$sim_and_dev|contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*): \
+    CONFIG += simulator $${simulator.sdk}
 
-    qtConfig(simulator_and_device) {
-        # For a simulator_and_device build all the config tests
-        # are based on the device's ARM SDK, but we know that the simulator
-        # is Intel and that we support SSE/SSE2.
-        QT_CPU_FEATURES.$$QT_ARCH += sse sse2
-        CONFIG += sse sse2
-        DEFINES += QT_COMPILER_SUPPORTS_SSE2
-    }
+$$sim_and_dev {
+    # For a simulator_and_device build all the config tests
+    # are based on the device's ARM SDK, but we know that the simulator
+    # is Intel and that we support SSE/SSE2.
+    QT_CPU_FEATURES.$$QT_ARCH += sse sse2
+    CONFIG += sse sse2
+    DEFINES += QT_COMPILER_SUPPORTS_SSE2
 }
 
+unset(sim_and_dev)
+
 load(default_pre)
 
 # Check for supported Xcode versions
-- 
cgit v1.2.3