From 8fb136fc8a572b312b013272439af024a8e203a1 Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Thu, 18 Dec 2025 10:23:57 +0000 Subject: [PATCH] Revert "Set ZLIB_ROOT on Windows with MSVC" This reverts commit aecfc7e23b16eed0980f25e0b198a8fab1fea1b6. 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 Reviewed-by: Tatiana Borisova --- coin/platform_configs/cmake_platforms.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index cccf7ba8..bd6bcff3 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -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'