summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/qt_module.prf
diff options
context:
space:
mode:
authorKimmo Ollila <kimmo.ollila@qt.io>2017-01-14 14:30:04 +0200
committerKimmo Ollila <kimmo.ollila@theqtcompany.com>2017-01-18 13:07:57 +0000
commitd2d9d26b1e94607050e7d3c7efc5a7b5516386bb (patch)
tree45367e6f5de0f3c9e01891ee179975e29b3ebe01 /mkspecs/features/qt_module.prf
parentdaf2aa0047772acb294f795d70aabdd5c58765bf (diff)
Fix --exceptions flag usage on INTEGRITY
When an executable is being linked and uses a library that has been built with exceptions enabled, the executable will need the exceptions flag in order to link in the exceptions handling code. Change-Id: I3acdb571afbbcaf860fb0ef0482f704f605a9bbe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs/features/qt_module.prf')
-rw-r--r--mkspecs/features/qt_module.prf5
1 files changed, 5 insertions, 0 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index 31d628596c..23d75182d0 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -64,6 +64,11 @@ else: \
MODULE_DEFINE = QT_$${ucmodule}_LIB
MODULE_DEFINES = $$MODULE_DEFINE $$MODULE_DEFINES
+# Make sure that the supporting runtime is linked into the application when
+# the module is built with exceptions enabled.
+integrity:CONFIG(exceptions, exceptions|exceptions_off): \
+ MODULE_CONFIG += exceptions
+
load(qt_build_paths)
header_module {