From e1b6513df584ad48fa92e383fd16e08293081bb9 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 22 Jul 2013 10:45:20 +0200 Subject: Fix crashes in tst_qquickcanvasitem with older Ubuntu toolchains Older versions appear to be much more sensitive to missing unwind tables, and as it turns out: We were compiling QtQuick (not QtQml) with -fno-exceptions. Since the entire module has access to the private V4 API and may therefore be subject to exception traversal, make sure to compile the entire module with CONFIG += exceptions. Change-Id: If2d029879392c22af7da2f1bba94366d51518226 Reviewed-by: Erik Verbruggen --- .qmake.conf | 5 +++++ src/imports/localstorage/localstorage.pro | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index f21f463f3c..6b70079d45 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -15,3 +15,8 @@ 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 diff --git a/src/imports/localstorage/localstorage.pro b/src/imports/localstorage/localstorage.pro index d3e7182a3b..15753263b8 100644 --- a/src/imports/localstorage/localstorage.pro +++ b/src/imports/localstorage/localstorage.pro @@ -4,7 +4,6 @@ TARGETPATH = QtQuick/LocalStorage IMPORT_VERSION = 2.0 QT = sql qml-private core-private -CONFIG += exceptions SOURCES += plugin.cpp -- cgit v1.2.3