diff options
| author | Michal Klocek <[email protected]> | 2025-08-07 08:43:53 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <[email protected]> | 2025-08-18 10:30:08 +0000 |
| commit | 8b54ca691cce2f343cf6fbbb7aa730862b3e55c6 (patch) | |
| tree | 4b93c1d42c5983439373ec9337de3d08cbd91beb | |
| parent | 86b4f465d6af24f039369c196a30db2c0c8e5aa2 (diff) | |
Add qt-zlib config to cross-compile window target6.10
After shocking realization that build artifacts are mixed between
cross-compiled and native window arm builds for installer add missing qt-zlib config, so configs match better.
The -no-opengl mismatch is covered in different patch.
Any auto detected platform configs and features mismatch is unknown,
but let's do hope it works (as the final output is not covered by
single ci test).
Pick-to: 6.9
Task-number: QTBUG-138859
Change-Id: I03562f1b518cf711cee894b5cf3f4512e2521f77
Reviewed-by: Tero Heikkinen <[email protected]>
(cherry picked from commit 493b592568d7154b521e40731697a29f20d0a781)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
| -rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 34130a06d..415bc4c1c 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -199,7 +199,7 @@ Configurations: Platform dependency: 'windows-10_22h2-mingw13' Environment variables: [ 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', - 'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer', + 'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer', 'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE', 'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}', |