From 4421b5c5a55a82926c7cd315174c62a1d3d25b8c Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 15 Sep 2014 17:35:36 +0200 Subject: build with QT_NO_TEXTEDIT Change-Id: I0c7ee38cf12de991e23c7259e65f2eaa7c8f7045 Reviewed-by: Oswald Buddenhagen --- src/scripttools/scripttools.pro | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro index 12d26a4..9b786ec 100644 --- a/src/scripttools/scripttools.pro +++ b/src/scripttools/scripttools.pro @@ -1,3 +1,6 @@ +load(qfeatures) +requires(!contains(QT_DISABLED_FEATURES, textedit)) + TARGET = QtScriptTools QT = core-private QT_PRIVATE = gui widgets-private script -- cgit v1.2.1 From 265a5a6e605c681ef9ba3683d7bc15d841bd4955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Mon, 6 Jan 2014 22:51:53 +0100 Subject: 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 Reviewed-by: Morten Johan Sørvig --- 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 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/* -- cgit v1.2.1