From 3b86bd5406d9e4b2a3778d5b4e16a371124afc80 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 29 Oct 2014 17:06:41 -0700 Subject: Reenable C++11 for ICC on OS X It's fixed for the Intel Composer XE 2015 (compiler version 15.0). Change-Id: I7960b2128743081e905d4b96acf55360f744fc69 Reviewed-by: Olivier Goffart --- mkspecs/macx-icc/qmake.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mkspecs/macx-icc') diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf index a1783c97ad..09994b639f 100644 --- a/mkspecs/macx-icc/qmake.conf +++ b/mkspecs/macx-icc/qmake.conf @@ -52,8 +52,7 @@ QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD -# Disabled, due to invalid C++11 code on Apple headers -#QMAKE_CXXFLAGS_CXX11 = -std=c++11 +QMAKE_CXXFLAGS_CXX11 = -std=c++11 QMAKE_CXXFLAGS_SPLIT_SECTIONS = $$QMAKE_CFLAGS_SPLIT_SECTIONS QMAKE_CXXFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG -- cgit v1.2.3