From f43a258fc46f090d53fbebb93a43d8124ff83f48 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 29 Aug 2016 10:06:33 +0200 Subject: [PATCH] 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 --- mkspecs/features/uikit/sdk.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}