From 3d0a60aaa4077a897d02ca5f3c0cc2d7da1007c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 3 Apr 2013 15:05:06 +0200 Subject: Enable C++11 on OSX when using Clang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This means we have to bump the deployment target to Lion (10.7), as the LLVM 'libc++' C++ standard library does not support Snow Leopard (10.6). For iOS the deployment target has to be bumped from 4.3 to 5.0, but we don't enable C++11 by default yet as it's not tested enough on iOS. Users who wish to deploy to 10.6 need to build their own Qt, passing -no-c++11 to configure. Change-Id: I7b5d20ab002db889d1091a4b7ff600f62caa7f06 Reviewed-by: Morten Johan Sørvig --- mkspecs/features/c++11.prf | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'mkspecs/features/c++11.prf') 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 +} -- cgit v1.2.3