lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2025-12-21 07:28:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Set ZLIB_ROOT on Windows with MSVC"

Browse Source 
This reverts commit aecfc7e23b.

Reason for revert: QtOpenAPI can use the zlib that is bundled with
Qt now (which is the case for all MSVC configurations in CI), and
that commit broke qtinsighttracker.

Task-number: QTBUG-138968
Fixes: QTBUG-142771
Pick-to: 6.11
Change-Id: I69344c52572a472baed96a136aecbe33b310da16
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
This commit is contained in:
Ivan Solovev
2025-12-18 10:23:57 +00:00
parent f032c3156d
commit 8fb136fc8a
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/platform_configs/cmake_platforms.yaml
View File

@@ -182,7 +182,6 @@ Configurations:
'VCPKG_TARGET_TRIPLET=x64-windows-qt',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
'ZLIB_ROOT={{.Env.ZLIB_PATH_AMD64}}',
]
-
Id: 'windows-11_24H2-msvc2022'
@@ -198,7 +197,6 @@ Configurations:
'VCPKG_TARGET_TRIPLET=x64-windows-qt',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
'ZLIB_ROOT={{.Env.ZLIB_PATH_AMD64}}',
]
-
Id: 'windows-11_23h2-arm64-msvc2022'
@@ -213,7 +211,6 @@ Configurations:
'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
'ZLIB_ROOT={{.Env.ZLIB_PATH_ARM64}}',
]
-
Id: 'windows-11_24H2-msvc2022-arm64'
@@ -256,7 +253,6 @@ Configurations:
'VCPKG_HOST_TRIPLET=x64-windows-qt',
'VCPKG_TARGET_TRIPLET=x64-windows-qt',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
'ZLIB_ROOT={{.Env.ZLIB_PATH_AMD64}}',
]
-
Id: 'rhel-9.6'