whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a sanitized JS export name for WASM modules 

Previously, a target name with a JS special character (like, -, for
example), would lead to an invalid export name being generated for
WASM modules. Sanitize these by replacing any non-alphanumeric
character with underscores, as is done for feature names.

Change-Id: I01fbc50bddedd011a9584f673d79d88a3bc09bbb
Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
bb10
Mikolaj Boc 2023-06-26 12:17:41 +02:00
parent e27841c2fb
commit 58a47edda1
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/Qt6WasmMacros.cmake
View File

@ -22,6 +22,8 @@ function(_qt_internal_wasm_add_target_helpers target)
endif()
set(APPNAME ${_target_output_name})
_qt_internal_wasm_export_name_for_target(_export_name ${target})
set(APPEXPORTNAME ${_export_name})
get_target_property(target_output_directory ${target} RUNTIME_OUTPUT_DIRECTORY)
@ -106,10 +108,16 @@ function(_qt_internal_add_wasm_extra_exported_methods target)
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 EXPORT_NAME=${export_name}")
endfunction()
function(_qt_internal_wasm_export_name_for_target out target)
get_target_property(export_name "${target}" QT_WASM_EXPORT_NAME)
if(export_name)
target_link_options("${target}" PRIVATE "SHELL:-s EXPORT_NAME=${export_name}")
set(${out} "${export_name}" PARENT_SCOPE)
else()
target_link_options("${target}" PRIVATE "SHELL:-s EXPORT_NAME=${target}_entry")
string(REGEX REPLACE "[^a-zA-Z0-9_]" "_" target "${target}")
set(${out} "${target}_entry" PARENT_SCOPE)
endif()
endfunction()

2
src/plugins/platforms/wasm/wasm_shell.html
View File

@ -57,7 +57,7 @@
exitData.text !== undefined ? ` (${exitData.text})` : '';
showUi(spinner);
},
entryFunction: window.@APPNAME@_entry,
entryFunction: window.@APPEXPORTNAME@,
containerElements: [screen],
}
});