From 41977d456b152d2b37c3941b3bf1b839d6096067 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Sat, 10 Jul 2021 21:12:29 +0200 Subject: [PATCH] CMake: Simplify resource setup in WASM platform plugin Use the BASE argument of qt_internal_add_resource to avoid the specification of resource aliases. Use QtBase_SOURCE_DIR in favor of QT_SOURCE_TREE to use a known CMake-provided variable in favor of our own cooked up one. Pick-to: 6.2 Task-number: QTBUG-88090 Change-Id: I0d8b30a1564495db475ae58596b52b373b2b173e Reviewed-by: Alexandru Croitor --- src/plugins/platforms/wasm/CMakeLists.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/plugins/platforms/wasm/CMakeLists.txt b/src/plugins/platforms/wasm/CMakeLists.txt index 10e247b7dd..49acd05886 100644 --- a/src/plugins/platforms/wasm/CMakeLists.txt +++ b/src/plugins/platforms/wasm/CMakeLists.txt @@ -37,19 +37,17 @@ qt_internal_add_plugin(QWasmIntegrationPlugin ) # Resources: -set_source_files_properties("${QT_SOURCE_TREE}/src/3rdparty/wasm/Vera.ttf" PROPERTIES QT_RESOURCE_ALIAS "Vera.ttf") -set_source_files_properties("${QT_SOURCE_TREE}/src/3rdparty/wasm/DejaVuSans.ttf" PROPERTIES QT_RESOURCE_ALIAS "DejaVuSans.ttf") -set_source_files_properties("${QT_SOURCE_TREE}/src/3rdparty/wasm/DejaVuSansMono.ttf" PROPERTIES QT_RESOURCE_ALIAS "DejaVuSansMono.ttf") - set(wasmfonts_resource_files - "${QT_SOURCE_TREE}/src/3rdparty/wasm/Vera.ttf" - "${QT_SOURCE_TREE}/src/3rdparty/wasm/DejaVuSans.ttf" - "${QT_SOURCE_TREE}/src/3rdparty/wasm/DejaVuSansMono.ttf" + "${QtBase_SOURCE_DIR}/src/3rdparty/wasm/Vera.ttf" + "${QtBase_SOURCE_DIR}/src/3rdparty/wasm/DejaVuSans.ttf" + "${QtBase_SOURCE_DIR}/src/3rdparty/wasm/DejaVuSansMono.ttf" ) qt_internal_add_resource(QWasmIntegrationPlugin "wasmfonts" PREFIX "/fonts" + BASE + "${QtBase_SOURCE_DIR}/src/3rdparty/wasm" FILES ${wasmfonts_resource_files} )