From 265a5a6e605c681ef9ba3683d7bc15d841bd4955 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@digia.com>
Date: Mon, 6 Jan 2014 22:51:53 +0100
Subject: [PATCH] Don't disable C++11 on Mac OS X
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>
---
src/script/script.pro | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/script/script.pro b/src/script/script.pro
index 8cb2f628..d343ab32 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/*
--
GitLab