From 8b5eb6cd09bd02eb704a47dc9d679ef706106198 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 1 Mar 2022 12:28:26 +0100 Subject: [PATCH] Add the missing --no-zstd option to the manual rcc calls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Alexandru Croitor Reviewed-by: Jörg Bornemann --- src/corelib/Qt6CoreMacros.cmake | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index ab332cfafc..c3d5c6b014 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -291,6 +291,10 @@ function(qt6_add_binary_resources target ) set(rcc_options ${_RCC_OPTIONS}) set(rcc_destination ${_RCC_DESTINATION}) + if(NOT QT_FEATURE_zstd) + list(APPEND rcc_options "--no-zstd") + endif() + if(NOT rcc_destination) set(rcc_destination ${CMAKE_CURRENT_BINARY_DIR}/${target}.rcc) endif() @@ -355,6 +359,10 @@ function(qt6_add_resources outfiles ) message(WARNING "Use qt6_add_binary_resources for binary option") endif() + if(NOT QT_FEATURE_zstd) + list(APPEND rcc_options "--no-zstd") + endif() + foreach(it ${rcc_files}) get_filename_component(outfilename ${it} NAME_WE) 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") endif() + if(NOT QT_FEATURE_zstd) + list(APPEND rcc_options "--no-zstd") + endif() + foreach(it ${rcc_files}) get_filename_component(outfilename ${it} NAME_WE)