From 9fa7dcf07e7ddba3e7b87883ce00642e7bab3eec Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 21 May 2025 17:49:06 +0200 Subject: [PATCH] Revert "Add no-opengl to cross-compile WoA" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adding no-opengl flag affects our release binaries and removes qt3d and qtdatavisualisation from packaging. Use run-opengl-tests feature instead. This reverts commit 9b7d6aedbced74021338c1c9b881cc3afef4a3cd. Task-number: COIN-1211 Fixes: QTBUG-136360 Pick-to: dev Change-Id: Iaeb1dfa93e33a1f2d94357c6b4c9116e7633fd3f Reviewed-by: Michael Brüning --- 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 f1b4e817..7fce900b 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -164,7 +164,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-opengl -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 -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer -no-feature-run-opengl-tests', '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}}',