aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf5
-rw-r--r--src/imports/localstorage/localstorage.pro1
2 files changed, 5 insertions, 1 deletions
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