diff options
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | mkspecs/common/clang-mac.conf | 3 | ||||
| -rw-r--r-- | mkspecs/features/c++11.prf | 7 | ||||
| -rw-r--r-- | mkspecs/features/mac/sdk.prf | 3 |
4 files changed, 15 insertions, 2 deletions
@@ -2814,9 +2814,9 @@ if [ "$CFG_FORCEDEBUGINFO" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG force_debug_info" fi -# iOS builds should be static to be able to submit to the App Store if [ "$XPLATFORM_IOS" = "yes" ]; then - CFG_SHARED="no" + CFG_SHARED="no" # iOS builds should be static to be able to submit to the App Store + CFG_CXX11="no" # C++11 support disabled for now fi # disable GTK style support auto-detection on Mac diff --git a/mkspecs/common/clang-mac.conf b/mkspecs/common/clang-mac.conf index efe771d24d..3280274f36 100644 --- a/mkspecs/common/clang-mac.conf +++ b/mkspecs/common/clang-mac.conf @@ -5,3 +5,6 @@ QMAKE_OBJCXXFLAGS_PRECOMPILE = -x objective-c++-header -c ${QMAKE_PCH_INPUT} QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvm.clang.1_0 + +QMAKE_CXXFLAGS_CXX11 += -stdlib=libc++ +QMAKE_LFLAGS_CXX11 += -stdlib=libc++ diff --git a/mkspecs/features/c++11.prf b/mkspecs/features/c++11.prf index 4b56fa9fd2..32eaca4a9b 100644 --- a/mkspecs/features/c++11.prf +++ b/mkspecs/features/c++11.prf @@ -1,3 +1,10 @@ QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_CXX11 QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CXXFLAGS_CXX11 QMAKE_LFLAGS += $$QMAKE_LFLAGS_CXX11 + +contains(QMAKE_LFLAGS, -stdlib=libc++) { + equals(QMAKE_MACOSX_DEPLOYMENT_TARGET, 10.6): \ + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7 + contains(QMAKE_IOS_DEPLOYMENT_TARGET, ^4.*): \ + QMAKE_IOS_DEPLOYMENT_TARGET = 5.0 +} diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf index eaa3108a8b..10d94bed11 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf @@ -40,6 +40,9 @@ isEmpty(QMAKE_MAC_PLATFORM_NAME): error("Could not resolve platform name for SDK # 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) + # C++11 support may affect the deployment target + c++11: load(c++11) + ios:!host_build: \ deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET else: \ |