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-23 18:03:07 +0200 |
| commit | 265a5a6e605c681ef9ba3683d7bc15d841bd4955 (patch) | |
| tree | b1d0cc9d9610ff8be9530cf52f914257439ad517 | |
| parent | 4421b5c5a55a82926c7cd315174c62a1d3d25b8c (diff) | |
Don't disable C++11 on Mac OS X5.3
On OS X, 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.
Change-Id: I0ad8fb550ef79ac37ac97a75799ac38aa19d39d4
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.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/* |