summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mkspecs/features/mac/default_post.prf9
-rw-r--r--mkspecs/macx-ios-clang/features/default_post.prf9
2 files changed, 9 insertions, 9 deletions
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
index 614b336f27..da3e22b5f3 100644
--- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf
@@ -25,6 +25,15 @@ qt:!isEmpty(QT_CONFIG) {
warning("Qt was not built with C++11 enabled, disabling feature")
CONFIG -= c++11
}
+
+ !c++11 {
+ # Explicitly use libstdc++ if C++11 support is not enabled,
+ # as otherwise the compiler will choose the standard library
+ # based on the deployment target, which for iOS 7 and OS X 10.9
+ # is libc++, and we can't mix and match the two.
+ QMAKE_CXXFLAGS += -stdlib=libstdc++
+ QMAKE_LFLAGS += -stdlib=libstdc++
+ }
}
}
diff --git a/mkspecs/macx-ios-clang/features/default_post.prf b/mkspecs/macx-ios-clang/features/default_post.prf
index 6662bb9c8e..28ad095da7 100644
--- a/mkspecs/macx-ios-clang/features/default_post.prf
+++ b/mkspecs/macx-ios-clang/features/default_post.prf
@@ -178,15 +178,6 @@ macx-xcode {
launch_images.files = $$copy_image.output
QMAKE_BUNDLE_DATA += launch_images
- !contains(QT_CONFIG, c++11) {
- # Explicitly use libstdc++ if C++11 support is not enabled,
- # as otherwise Xcode will choose the compiler default based
- # on the deployment target, which for iOS 7 is libc++. This
- # breaks compilation since Qt was built against libstdc++.
- QMAKE_CXXFLAGS += -stdlib=libstdc++
- QMAKE_LFLAGS += -stdlib=libstdc++
- }
-
# Make the default debug information format for debug builds
# DWARF instead of DWARF with dSYM. This cuts down build times
# for application debug builds significantly, as Xcode doesn't