1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rcc: teach qmake not to use zstd when not available

Browse Source 
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>
This commit is contained in:
Samuli Piippo 2022-07-05 15:34:31 +03:00 committed by Qt Cherry-pick Bot
parent 2422933f6d
commit 659121dc6a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.cmake
View File

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

1
mkspecs/features/resources.prf
View File

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