From 9e6a8a0f9d337f1d020bfd35e42ee782c2e23b3f Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 21 May 2024 12:26:37 +0300 Subject: [PATCH] Windows ARM: Disable OpenGL as not supported on WoA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-6109 Task-number: QTBUG-126030 Fixes: QTBUG-125438 Fixes: QTBUG-125439 Fixes: QTBUG-125444 Fixes: QTBUG-125445 Pick-to: 6.7 Change-Id: I05297b056bf1f39e6a77198a2244eedd05c1f963 Reviewed-by: Tony Sarajärvi (cherry picked from commit 049190024909d192dacd9098c557aec7d8264ab1) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index bc2130bf..278ab88e 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -130,7 +130,7 @@ Configurations: Template: 'qtci-windows-11_22H2-aarch64-51' Compiler: 'MSVC2022' Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'InsignificantTests'] - Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -c++std c++20 -no-sql-psql' + Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -c++std c++20 -no-sql-psql -no-opengl' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF',