summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-08-29 10:06:33 +0200
committerJake Petroules <jake.petroules@qt.io>2016-08-30 12:55:57 +0000
commitf43a258fc46f090d53fbebb93a43d8124ff83f48 (patch)
tree0725e1f4de8094f6a9f08786f0f6092a0400c792 /mkspecs
parent7037539f385d05725ccf863167db69d771daa8c3 (diff)
fix build with configure -sdk iphonesimulator
we need to suppress another qtConfig(simulator_and_device) check during the configuration phase. amends 60985aa4. Change-Id: Iae279d282d47b4c254b7a6f9f33315abe126eff0 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/uikit/sdk.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/uikit/sdk.prf b/mkspecs/features/uikit/sdk.prf
index 4ec3600450..54674eb396 100644
--- a/mkspecs/features/uikit/sdk.prf
+++ b/mkspecs/features/uikit/sdk.prf
@@ -1,7 +1,7 @@
# In case the user sets the SDK manually
contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*) {
- qtConfig(simulator_and_device): \
+ !isEmpty(QT_VERSION):qtConfig(simulator_and_device): \
error("Simulator is handled automatically for simulator_and_device")
CONFIG += simulator $${simulator.sdk}