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 <jake.petroules@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-10-14 13:12:24 +02:00 committed by Jake Petroules
parent 1cc6cc56e1
commit 56395c5cc1

View File

@ -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},