diff --git a/mkspecs/features/wasm/wasm.prf b/mkspecs/features/wasm/wasm.prf index a257f5f5cb5..4bbba8c2aa6 100644 --- a/mkspecs/features/wasm/wasm.prf +++ b/mkspecs/features/wasm/wasm.prf @@ -50,11 +50,7 @@ exists($$QMAKE_QT_CONFIG) { } EMCC_LFLAGS += -s INITIAL_MEMORY=$$INITIAL_MEMORY isEmpty(QT_WASM_MAXIMUM_MEMORY) { - qtConfig(wasm-jspi) { - MAXIMUM_MEMORY = 2GB # Avoid triggering Emscripten bug #23834 - } else { - MAXIMUM_MEMORY = 4GB # 32-bit max - } + MAXIMUM_MEMORY = 4GB # 32-bit max } else { MAXIMUM_MEMORY = $$QT_WASM_MAXIMUM_MEMORY } diff --git a/src/corelib/Qt6WasmMacros.cmake b/src/corelib/Qt6WasmMacros.cmake index eae356679bd..69de55cf57f 100644 --- a/src/corelib/Qt6WasmMacros.cmake +++ b/src/corelib/Qt6WasmMacros.cmake @@ -121,12 +121,7 @@ function(_qt_internal_wasm_add_target_helpers target) if(_tmp_maximumMemory) set(QT_WASM_MAXIMUM_MEMORY "${_tmp_maximumMemory}") elseif(NOT DEFINED QT_WASM_MAXIMUM_MEMORY) - if(QT_FEATURE_wasm_jspi) - # Work around Emscripten >2GB and JSPI compatibility issue. - set(QT_WASM_MAXIMUM_MEMORY "2GB") - else() - set(QT_WASM_MAXIMUM_MEMORY "4GB") - endif() + set(QT_WASM_MAXIMUM_MEMORY "4GB") endif() target_link_options("${target}" PRIVATE "SHELL:-s MAXIMUM_MEMORY=${QT_WASM_MAXIMUM_MEMORY}")