From 0cd776f2cdeebb6b8d2cd5d17be7a1d561708ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 16 Jan 2014 13:47:19 +0100 Subject: iOS: Prevent trying to use both libc++ and libstdc++ Static builds of Qt will automatically enable C++11 for all projects, but this happens in mac/default_post which is after our check. Change-Id: I22a01e5d876242263fa31f8a404a65905c6c1877 Reviewed-by: Simon Hausmann --- mkspecs/macx-ios-clang/features/default_post.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs/macx-ios-clang') diff --git a/mkspecs/macx-ios-clang/features/default_post.prf b/mkspecs/macx-ios-clang/features/default_post.prf index 3428823624..09e1951be0 100644 --- a/mkspecs/macx-ios-clang/features/default_post.prf +++ b/mkspecs/macx-ios-clang/features/default_post.prf @@ -184,7 +184,7 @@ macx-xcode { launch_images.files = $$copy_image.output QMAKE_BUNDLE_DATA += launch_images - !c++11 { + !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 -- cgit v1.2.3