diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-06-24 18:01:21 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-06-28 02:16:10 +0200 |
| commit | 4c2953fbcd5db83ac6d202ba0d2b4262a1eba04b (patch) | |
| tree | e3ac91060ffa184036361225ec94987605b779db /mkspecs/macx-icc/qmake.conf | |
| parent | 93563952d00f865b73136f6a316ca2b8732db85f (diff) | |
Disable C++11 support for ICC on OS X
ICC does support C++11, but the Apple headers contain invalid code that
Clang seems to accept. In C++11 mode, code using CF_ENUM expands to:
typedef enum EnumName : CFIndex EnumName; enum EnumName {
Which is valid Objective C++, but not valid C++.
Bug reports to Intel and to Apple are pending.
Discussed-on: https://groups.google.com/a/isocpp.org/d/msg/std-discussion/yDfkDo6C0BM/EVWzwjVbyh4J
Change-Id: I7d501e94212a90f5c7197a3b56016dadac2c44ad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs/macx-icc/qmake.conf')
| -rw-r--r-- | mkspecs/macx-icc/qmake.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf index 0424effd64..370a738c6a 100644 --- a/mkspecs/macx-icc/qmake.conf +++ b/mkspecs/macx-icc/qmake.conf @@ -51,7 +51,8 @@ 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 -QMAKE_CXXFLAGS_CXX11 = -std=c++11 +# Disabled, due to invalid C++11 code on Apple headers +#QMAKE_CXXFLAGS_CXX11 = -std=c++11 QMAKE_CXXFLAGS_SPLIT_SECTIONS = $$QMAKE_CFLAGS_SPLIT_SECTIONS QMAKE_LINK = icpc |