From d2d9d26b1e94607050e7d3c7efc5a7b5516386bb Mon Sep 17 00:00:00 2001 From: Kimmo Ollila Date: Sat, 14 Jan 2017 14:30:04 +0200 Subject: 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 --- mkspecs/features/qt_module.prf | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'mkspecs/features/qt_module.prf') 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 { -- cgit v1.2.3