diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-08-23 15:39:34 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-23 20:28:42 +0000 |
| commit | 338c850b10473bf5edb5d2d95406b7a261d14cab (patch) | |
| tree | 1e4119fb3d0d7919299d5ca2830a141233940f55 /src/corelib/Qt6AndroidMacros.cmake | |
| parent | 709a5fbde8505e93d577e00c591b40241710f53e (diff) | |
Add the json option to disable the zstd based compression
Need to disable zstd compression if its support is not built in Qt
for Android. The flag is dected when configuring user's project and
is a part of the deployment settings. This partially fixes loading of
android_rcc_bundle.rcc.
Task-number: QTBUG-93340
Task-number: QTBUG-95969
Change-Id: I635afb3f9e182a559d53e9344e07f62788f9837d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit f037357232c2157d942ad9a104543d087f8a043b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib/Qt6AndroidMacros.cmake')
| -rw-r--r-- | src/corelib/Qt6AndroidMacros.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 55e2ac1a80..c5f04c49bc 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -234,6 +234,14 @@ function(qt6_android_generate_deployment_settings target) string(APPEND file_contents " \"extraPrefixDirs\" : [ ${extra_prefix_list} ],\n") + if(QT_FEATURE_zstd) + set(is_zstd_enabled "true") + else() + set(is_zstd_enabled "false") + endif() + string(APPEND file_contents + " \"zstdCompression\": ${is_zstd_enabled},\n") + # Last item in json file # base location of stdlibc++, will be suffixed by androiddeploy qt |