summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/mac
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-02-28 18:31:11 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-28 19:22:05 +0100
commit0520631b2ba04fb99d3d46385f04279cd89a7732 (patch)
treec970fab36c889741dedcb708e520fe9ec517fc07 /mkspecs/features/mac
parent439002cddeb32766ea9806ac8b5cf9a973ed0f13 (diff)
parent70d5cb406fda70d175faac5f9588f0e345588c56 (diff)
Merge "Merge branch 'ios' into dev" into refs/staging/dev
Diffstat (limited to 'mkspecs/features/mac')
-rw-r--r--mkspecs/features/mac/sdk.prf10
1 files changed, 9 insertions, 1 deletions
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
index 320e4e5382..16dd16159c 100644
--- a/mkspecs/features/mac/sdk.prf
+++ b/mkspecs/features/mac/sdk.prf
@@ -37,7 +37,15 @@
}
!equals(MAKEFILE_GENERATOR, XCODE) {
- version_min_flag = -m$${QMAKE_MAC_PLATFORM_NAME}-version-min=$$QMAKE_MACOSX_DEPLOYMENT_TARGET
+ # FIXME: Get the version_min_flag out of the platform's 'Native Build System.xcspec'
+ version_identifier = $$replace(QMAKE_MAC_PLATFORM_NAME, iphonesimulator, ios-simulator)
+
+ ios:!host_build: \
+ deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET
+ else: \
+ deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET
+
+ version_min_flag = -m$${version_identifier}-version-min=$$deployment_target
QMAKE_CFLAGS += $$version_min_flag
QMAKE_CXXFLAGS += $$version_min_flag
QMAKE_OBJECTIVE_CFLAGS += $$version_min_flag