summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-12-04 14:21:27 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-05 14:17:50 +0100
commitbf246e6c28be88ea71220d8812fdfbb414f070f5 (patch)
treedbdd40fa992a48e1294dd1cf32e6096f2d8607bf
parentcea101bd10cc158b97d5fbf45b33dad9b649c08b (diff)
iOS: Explicitly use libstdc++ when C++11 support is not enabled
Otherwise Xcode might choose to use libc++, eg when the deployment target is iOS7, and this doesn't work when Qt itself was built using libstdc++. Change-Id: I0b0f36666ed318be9aae87ebaeb0d344109566ac Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
-rw-r--r--mkspecs/macx-ios-clang/features/default_post.prf9
1 files changed, 9 insertions, 0 deletions
diff --git a/mkspecs/macx-ios-clang/features/default_post.prf b/mkspecs/macx-ios-clang/features/default_post.prf
index 262a8f1889..8d46f35201 100644
--- a/mkspecs/macx-ios-clang/features/default_post.prf
+++ b/mkspecs/macx-ios-clang/features/default_post.prf
@@ -183,6 +183,15 @@ macx-xcode {
QMAKE_SUBSTITUTES += copy_image
launch_images.files = $$copy_image.output
QMAKE_BUNDLE_DATA += launch_images
+
+ !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++
+ }
}
macx-xcode {