AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add the missing --no-zstd option to the manual rcc calls

Browse Source 
Add the missing --no-zstd argument when generating resource artifacts
using binary or big resources or an existing .qrc file.

Task-number: QTBUG-101353
Change-Id: If930f0cb7ba3c89b21b01552aefd6c0e33fe5cb3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexey Edelev 2022-03-01 12:28:26 +01:00
parent 03b9304703
commit 8b5eb6cd09
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/Qt6CoreMacros.cmake
View File

@ -291,6 +291,10 @@ function(qt6_add_binary_resources target )
set(rcc_options ${_RCC_OPTIONS}) set(rcc_options ${_RCC_OPTIONS})
set(rcc_destination ${_RCC_DESTINATION}) set(rcc_destination ${_RCC_DESTINATION})
if(NOT QT_FEATURE_zstd)
list(APPEND rcc_options "--no-zstd")
endif()
if(NOT rcc_destination) if(NOT rcc_destination)
set(rcc_destination ${CMAKE_CURRENT_BINARY_DIR}/${target}.rcc) set(rcc_destination ${CMAKE_CURRENT_BINARY_DIR}/${target}.rcc)
endif() endif()
@ -355,6 +359,10 @@ function(qt6_add_resources outfiles )
message(WARNING "Use qt6_add_binary_resources for binary option") message(WARNING "Use qt6_add_binary_resources for binary option")
endif() endif()
if(NOT QT_FEATURE_zstd)
list(APPEND rcc_options "--no-zstd")
endif()
foreach(it ${rcc_files}) foreach(it ${rcc_files})
get_filename_component(outfilename ${it} NAME_WE) get_filename_component(outfilename ${it} NAME_WE)
get_filename_component(infile ${it} ABSOLUTE) get_filename_component(infile ${it} ABSOLUTE)
@ -416,6 +424,10 @@ function(qt6_add_big_resources outfiles )
message(WARNING "Use qt6_add_binary_resources for binary option") message(WARNING "Use qt6_add_binary_resources for binary option")
endif() endif()
if(NOT QT_FEATURE_zstd)
list(APPEND rcc_options "--no-zstd")
endif()
foreach(it ${rcc_files}) foreach(it ${rcc_files})
get_filename_component(outfilename ${it} NAME_WE) get_filename_component(outfilename ${it} NAME_WE)