From a825cd1a3f6591caa993112be45539e50ce1bfc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Mon, 5 Jun 2023 20:55:12 +0200 Subject: [PATCH] wasm: add preload config for shared libraries build Preload Qt plugins and QML imports by default. The json files contain file listings generated by scripts in qtbase/util/wasm/preload. Task-number: QTBUG-63925 Change-Id: I123b7a46fa19fa75ef214e8edb92e15ef635e5ba Reviewed-by: Lorn Potter (cherry picked from commit 7620c7b26ec19e902592baf7f7c4185392c2b15d) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/Qt6WasmMacros.cmake | 8 ++++++++ src/plugins/platforms/wasm/wasm_shell.html | 1 + 2 files changed, 9 insertions(+) diff --git a/src/corelib/Qt6WasmMacros.cmake b/src/corelib/Qt6WasmMacros.cmake index 6e004dc862a..3ec4ed58582 100644 --- a/src/corelib/Qt6WasmMacros.cmake +++ b/src/corelib/Qt6WasmMacros.cmake @@ -23,6 +23,14 @@ function(_qt_internal_wasm_add_target_helpers target) set(APPNAME ${_target_output_name}) + # Shared library builds preload plugins and qml imports by default. + # The json files are generated by scripts in qtbase/util/wasm/preload + if (QT_FEATURE_shared) + set(PRELOAD "preload: ['qt_plugins.json', 'qt_qml_imports.json'],") + else() + set(PRELOAD "") + endif() + get_target_property(target_output_directory ${target} RUNTIME_OUTPUT_DIRECTORY) get_target_property(is_test ${target} _qt_is_test_executable) diff --git a/src/plugins/platforms/wasm/wasm_shell.html b/src/plugins/platforms/wasm/wasm_shell.html index 99248901220..26d914ea230 100644 --- a/src/plugins/platforms/wasm/wasm_shell.html +++ b/src/plugins/platforms/wasm/wasm_shell.html @@ -59,6 +59,7 @@ }, entryFunction: window.createQtAppInstance, containerElements: [screen], + @PRELOAD@ } }); } catch (e) {