diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-07-05 15:34:31 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2022-07-06 19:41:31 +0300 |
| commit | 6eda4919f252c53f313441afbedb4d0f98e94c9a (patch) | |
| tree | bd617b094a7089f8d7acc60bcc7ed6eb23eb672b /mkspecs/features/resources.prf | |
| parent | 1c0a56a2f3300750978f2d6c703b2b917e03e718 (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
Pick-to: 6.4 6.3 6.2
Change-Id: Ia0378742a50e2a85f59985dea2506d3dda5f28e8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'mkspecs/features/resources.prf')
| -rw-r--r-- | mkspecs/features/resources.prf | 1 |
1 files changed, 1 insertions, 0 deletions
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() |