From 56395c5cc1791367354e225c65dce79d7522c7f2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 14 Oct 2016 13:12:24 +0200 Subject: limit ability to override QMAKE_MAC_SDK project files may not override QMAKE_MAC_SDK any more, which seems to be no big loss. it is still possible to override the sdk on the configure command line (but note that this only ever worked for the target sdk). this simplification is preparation for subsequent changes. Change-Id: I3201629af132fa3938b13577854f3b19857a1b5a Reviewed-by: Jake Petroules --- mkspecs/features/uikit/sdk.prf | 8 -------- 1 file changed, 8 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/uikit/sdk.prf b/mkspecs/features/uikit/sdk.prf index 54674eb396..eb7cb52dae 100644 --- a/mkspecs/features/uikit/sdk.prf +++ b/mkspecs/features/uikit/sdk.prf @@ -1,12 +1,4 @@ -# In case the user sets the SDK manually -contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*) { - !isEmpty(QT_VERSION):qtConfig(simulator_and_device): \ - error("Simulator is handled automatically for simulator_and_device") - - CONFIG += simulator $${simulator.sdk} -} - build_pass:simulator: \ QMAKE_MAC_SDK ~= s,^$${device.sdk},$${simulator.sdk}, -- cgit v1.2.3