From 659121dc6a6af325592776fadfec0bb1ff999b1b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 5 Jul 2022 15:34:31 +0300 Subject: [PATCH] rcc: teach qmake not to use zstd when not available MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The zstd feature might have different values between the host and target, in which case qmake must tell rcc not to use zstd when the feature is disabled. Amends 14546d1816a877690cda71f02c275303ef42afa8 Fixes: QTBUG-103794 Change-Id: Ia0378742a50e2a85f59985dea2506d3dda5f28e8 Reviewed-by: Alexandru Croitor Reviewed-by: Jörg Bornemann (cherry picked from commit 6eda4919f252c53f313441afbedb4d0f98e94c9a) Reviewed-by: Qt Cherry-pick Bot --- configure.cmake | 2 +- mkspecs/features/resources.prf | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.cmake b/configure.cmake index a1ca6e5ecbe..fccb71161bb 100644 --- a/configure.cmake +++ b/configure.cmake @@ -888,7 +888,7 @@ qt_feature("system-zlib" PRIVATE LABEL "Using system zlib" CONDITION WrapSystemZLIB_FOUND ) -qt_feature("zstd" PRIVATE +qt_feature("zstd" PUBLIC LABEL "Zstandard support" CONDITION WrapZSTD_FOUND ) diff --git a/mkspecs/features/resources.prf b/mkspecs/features/resources.prf index a9ef9a7155f..7fbd16d3bd0 100644 --- a/mkspecs/features/resources.prf +++ b/mkspecs/features/resources.prf @@ -4,6 +4,7 @@ isEmpty(QMAKE_MOD_RCC):QMAKE_MOD_RCC = qrc !contains(QMAKE_RESOURCE_FLAGS, -root):!isEmpty(QMAKE_RESOURCE_ROOT):QMAKE_RESOURCE_FLAGS += -root $$QMAKE_RESOURCE_ROOT !contains(QMAKE_RESOURCE_FLAGS, -name): QMAKE_RESOURCE_FLAGS += -name ${QMAKE_FILE_BASE} +!qtConfig(zstd): QMAKE_RESOURCE_FLAGS += --no-zstd load(resources_functions) qtFlattenResources()