From 0a3e9a41b1dbf7635865e3a9788075e11e5fc74b Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 30 Oct 2013 10:08:28 +0100 Subject: Remove the last C++ exceptions from QtQml Also clean up and compile the repository with exceptions disabled again. Change-Id: I653ae89353284b2f4ab884384f8ea6a5d100785d Reviewed-by: Simon Hausmann --- .qmake.conf | 17 ----------------- 1 file changed, 17 deletions(-) (limited to '.qmake.conf') diff --git a/.qmake.conf b/.qmake.conf index 10a0930287..b0bc49d477 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -4,20 +4,3 @@ CONFIG += warning_clean MODULE_VERSION = 5.2.0 -# For the JS engine we need to be able to produce back traces, -# and as we're using the C stack, we need the system to be able -# to walk it properly. Unfortunately on Windows with i386 there -# are no unwind tables, that can compensate for an omitted frame -# pointer, so we have no choice but to disable the frame pointer -# omission optimizations. -# Only within the qtdeclarative module we support throwing V4 -# exceptions, hence the choice of applying this change here. -win32:equals(QT_ARCH, "i386") { - *msvc*: QMAKE_CXXFLAGS += -Oy- - *g++*: QMAKE_CXXFLAGS += -fno-omit-frame-pointer -} - -# Any code within this module has access to the private V4 API and -# can therefore be subject to exception traversal. Support for exceptions -# is therefore required, especially with older toolchains. -CONFIG += exceptions -- cgit v1.2.3 From 893143e395ef53fbf7fcfae6b2c1f6fb59fd2c56 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 19 Nov 2013 12:05:39 +0100 Subject: Bump MODULE_VERSION to 5.2.1 Change-Id: I211610ee4153fa1e24de085d64bd735ce3746ae0 Reviewed-by: Oswald Buddenhagen --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.qmake.conf') diff --git a/.qmake.conf b/.qmake.conf index b0bc49d477..a0d132328a 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,5 +2,5 @@ load(qt_build_config) CONFIG += qt_example_installs CONFIG += warning_clean -MODULE_VERSION = 5.2.0 +MODULE_VERSION = 5.2.1 -- cgit v1.2.3