diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-07-05 15:34:31 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-07-07 13:23:34 +0000 |
| commit | f9ed1d909fc8ae497856db188fd6e2d5ddad6638 (patch) | |
| tree | 4da8675d696dae108193e670764fdbf89c38f8a5 | |
| parent | edea33a3ce178d3924b4f415e148b0bc84ddd32b (diff) | |
rcc: teach qmake not to use zstd when not available
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 <alexandru.croitor@qt.io>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 6eda4919f252c53f313441afbedb4d0f98e94c9a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | configure.cmake | 2 | ||||
| -rw-r--r-- | mkspecs/features/resources.prf | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.cmake b/configure.cmake index 5863e0f1f0..57e46a9d16 100644 --- a/configure.cmake +++ b/configure.cmake @@ -889,7 +889,7 @@ qt_feature("system-zlib" PRIVATE LABEL "Using system zlib" CONDITION WrapZLIB_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 a9ef9a7155..7fbd16d3bd 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() |