diff options
| author | Morten Sørvig <morten.sorvig@qt.io> | 2023-06-05 20:55:12 +0200 |
|---|---|---|
| committer | Morten Sørvig <morten.sorvig@qt.io> | 2023-07-04 15:42:02 +0200 |
| commit | 7620c7b26ec19e902592baf7f7c4185392c2b15d (patch) | |
| tree | e32434deab95f49aa1725128e2a7e9f973fa82c4 /src | |
| parent | 64007c749703090ebf7f9b1b49b4267bb9993b99 (diff) | |
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.
Pick-to: 6.6
Task-number: QTBUG-63925
Change-Id: I123b7a46fa19fa75ef214e8edb92e15ef635e5ba
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/Qt6WasmMacros.cmake | 8 | ||||
| -rw-r--r-- | src/plugins/platforms/wasm/wasm_shell.html | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/corelib/Qt6WasmMacros.cmake b/src/corelib/Qt6WasmMacros.cmake index ffc39d27a82..63d4090ed69 100644 --- a/src/corelib/Qt6WasmMacros.cmake +++ b/src/corelib/Qt6WasmMacros.cmake @@ -25,6 +25,14 @@ function(_qt_internal_wasm_add_target_helpers target) _qt_internal_wasm_export_name_for_target(_export_name ${target}) set(APPEXPORTNAME ${_export_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 9e4f0c2df3f..6be7956a3c8 100644 --- a/src/plugins/platforms/wasm/wasm_shell.html +++ b/src/plugins/platforms/wasm/wasm_shell.html @@ -59,6 +59,7 @@ }, entryFunction: window.@APPEXPORTNAME@, containerElements: [screen], + @PRELOAD@ } }); } catch (e) { |