diff options
-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 628437460a..10d8030885 100644 --- a/configure.cmake +++ b/configure.cmake @@ -861,7 +861,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 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() |