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

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 <alexandru.croitor@qt.io>
bb10
Joerg Bornemann 2021-07-10 21:12:29 +02:00
parent 70051c55fe
commit 41977d456b
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/platforms/wasm/CMakeLists.txt
View File

@ -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}
)