From a5205d983b52140e93d7f8afbe5f019aac2a9abb Mon Sep 17 00:00:00 2001 From: Mikolaj Boc Date: Wed, 14 Sep 2022 19:36:01 +0200 Subject: [PATCH] Set NO_EXCEPTIONS on executables on wasm This reflects the true state of exceptions on WASM, which are always disabled (DISABLE_EXCEPTION_CATCHING is always set with 1). Change-Id: I7b681846159caf61f291f78a7b4ddf5260dc341f Reviewed-by: Alexandru Croitor --- cmake/QtExecutableHelpers.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake index 61f4c005d12..44eae75bd2d 100644 --- a/cmake/QtExecutableHelpers.cmake +++ b/cmake/QtExecutableHelpers.cmake @@ -136,7 +136,12 @@ function(qt_internal_add_executable name) MACOSX_BUNDLE "${arg_GUI}" ) - qt_internal_set_exceptions_flags("${name}" ${arg_EXCEPTIONS}) + if(WASM) + # WASM unconditionally sets DISABLE_EXCEPTION_CATCHING=1 + qt_internal_set_exceptions_flags("${name}" NO_EXCEPTIONS) + else() + qt_internal_set_exceptions_flags("${name}" ${arg_EXCEPTIONS}) + endif() if(WASM) qt_internal_wasm_add_finalizers("${name}")