diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2014-01-06 22:51:53 +0100 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2014-09-20 15:58:27 +0200 |
| commit | f1d879f49fd4b8e3d5749902fcd5d0fb52b54ecf (patch) | |
| tree | 8b37ce3b9859b60caeb389c71c68255f1749388e | |
| parent | 0c6b5f226507841ad8daa6d3d0c9a3f9a65a8212 (diff) | |
| download | qtscript-f1d879f49fd4b8e3d5749902fcd5d0fb52b54ecf.tar.gz | |
Don't disable C++11 on OS X and iOS
On OS X and iOS, enabling C++11 has the side effect of switching
the standard library from libstdc++ to libc++. Qt 5.2 enables
C++11 by default, which leads to a Qt build that uses both
standard libraries. This is something we would like to avoid.
As with clang it is possible to build webkit also with C++11
instead of forcing the use of libc++ also without C++11
we simply build with C++11 on OS X and iOS.
Change-Id: I0ad8fb550ef79ac37ac97a75799ac38aa19d39d4
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
| -rw-r--r-- | src/script/script.pro | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/script/script.pro b/src/script/script.pro index 8cb2f62..d343ab3 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -76,7 +76,9 @@ integrity { } # WebKit doesn't compile in C++0x mode -*-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x -CONFIG -= c++11 +!mac { + *-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x + CONFIG -= c++11 +} TR_EXCLUDE = $$WEBKITDIR/* |