1 files changed, 10 insertions, 10 deletions
diff --git a/cmake/QtWasmHelpers.cmake b/cmake/QtWasmHelpers.cmake
index 29478b33a4..41ef5cb0ba 100644
--- a/cmake/QtWasmHelpers.cmake
+++ b/cmake/QtWasmHelpers.cmake
@@ -18,14 +18,9 @@ function (qt_internal_setup_wasm_target_properties wasmTarget)
         target_compile_options("${wasmTarget}" INTERFACE "SHELL:-s MEMORY64=1" )
         target_link_options("${wasmTarget}" INTERFACE   "SHELL:-s MEMORY64=1" -mwasm64)
     endif()
-    # Enable MODULARIZE and set EXPORT_NAME, which makes it possible to
-    # create application instances using a global constructor function,
-    # e.g. let app_instance = await createQtAppInstance().
-    # (as opposed to MODULARIZE=0, where Emscripten creates a global app
-    # instance object at Javascript eval time)
-    target_link_options("${wasmTarget}" INTERFACE
-    "SHELL:-s MODULARIZE=1"
-    "SHELL:-s EXPORT_NAME=createQtAppInstance")
+    # Enable MODULARIZE so that we are able to set EXPORT_NAME later and instantiate on demand (with
+    # MODULARIZE=0, emscripten creates a global app instance object at Javascript eval time)
+    target_link_options("${wasmTarget}" INTERFACE "SHELL:-s MODULARIZE=1")
 
     #simd
     if (QT_FEATURE_wasm_simd128)
@@ -39,8 +34,6 @@ function (qt_internal_setup_wasm_target_properties wasmTarget)
     if (QT_FEATURE_wasm_exceptions)
         target_compile_options("${wasmTarget}" INTERFACE -fwasm-exceptions)
         target_link_options("${wasmTarget}" INTERFACE -fwasm-exceptions)
-    else()
-        target_link_options("${wasmTarget}" INTERFACE "SHELL:-s DISABLE_EXCEPTION_CATCHING=1")
     endif()
 
     if (QT_FEATURE_thread)
@@ -105,6 +98,12 @@ function (qt_internal_setup_wasm_target_properties wasmTarget)
             "${enable_main_module_if_needed}"
         )
 
+        # Add Qt libdir to linker library paths
+        set(qt_lib_location
+            "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_LIBDIR}")
+        target_link_options("${wasmTarget}" INTERFACE
+            "$<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:SHELL:" -L${qt_lib_location}/>)
+
         target_compile_options("${wasmTarget}" INTERFACE "${set_shared_module_type_if_needed}")
         target_link_options("${wasmTarget}" INTERFACE "${set_shared_module_type_if_needed}")
 
@@ -120,6 +119,7 @@ function (qt_internal_setup_wasm_target_properties wasmTarget)
 endfunction()
 
 function(qt_internal_wasm_add_finalizers target)
+    qt_add_list_file_finalizer(_qt_internal_set_wasm_export_name ${target})
     qt_add_list_file_finalizer(_qt_internal_add_wasm_extra_exported_methods ${target})
     qt_add_list_file_finalizer(_qt_internal_wasm_add_target_helpers ${target})
 endfunction()