diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-27 23:57:04 +0100 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-27 23:57:06 +0100 |
commit | 70d5cb406fda70d175faac5f9588f0e345588c56 (patch) | |
tree | 1b7e95bdf142da42a5d9fea6068a46c78055eddd /mkspecs/features/mac | |
parent | 3b5600f6ee9f2982c5a93250e577f87a34fe32d1 (diff) | |
parent | 9b05f675e311d1962f0670193cf4df75a07f4999 (diff) |
Merge branch 'ios' into dev
Change-Id: I5d18d502908920a44bbc506aba77dd805d94d843
Diffstat (limited to 'mkspecs/features/mac')
-rw-r--r-- | mkspecs/features/mac/sdk.prf | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf index 4c3e2d2b5a..57dcf7f5eb 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf @@ -36,7 +36,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 |