summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-04-03 15:05:06 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-05 14:23:23 +0200
commit3d0a60aaa4077a897d02ca5f3c0cc2d7da1007c3 (patch)
tree9aff6f552df44e04b4f9062a642454bae61b7896 /configure
parent30d01db3a59f40af2352aeea0c4ce3cc79721975 (diff)
Enable C++11 on OSX when using Clang
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 <morten.sorvig@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 4de2fbb714..99738868d9 100755
--- a/configure
+++ b/configure
@@ -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