diff --git a/cmake/QtWasmHelpers.cmake b/cmake/QtWasmHelpers.cmake index 41ef5cb0ba8..bb6e2dede69 100644 --- a/cmake/QtWasmHelpers.cmake +++ b/cmake/QtWasmHelpers.cmake @@ -18,9 +18,6 @@ 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 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) diff --git a/src/corelib/Qt6WasmMacros.cmake b/src/corelib/Qt6WasmMacros.cmake index 1de6e5448c7..40522dc7eee 100644 --- a/src/corelib/Qt6WasmMacros.cmake +++ b/src/corelib/Qt6WasmMacros.cmake @@ -126,6 +126,7 @@ endfunction() function(_qt_internal_set_wasm_export_name target) _qt_internal_wasm_export_name_for_target(export_name ${target}) + target_link_options("${target}" PRIVATE "SHELL:-s MODULARIZE=1") target_link_options("${target}" PRIVATE "SHELL:-s EXPORT_NAME=${export_name}") endfunction()