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

Revert "Add no-opengl to cross-compile WoA"

Browse Source 
Adding no-opengl flag affects our release binaries
and removes qt3d and qtdatavisualisation from packaging.
Use run-opengl-tests feature instead.

This reverts commit 9b7d6aedbc.

Task-number: COIN-1211
Fixes: QTBUG-136360
Change-Id: Iaeb1dfa93e33a1f2d94357c6b4c9116e7633fd3f
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
(cherry picked from commit 9fa7dcf07e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Michal Klocek
2025-05-21 17:49:06 +02:00
committed by Qt Cherry-pick Bot
parent c73dbf6dfe
commit c768dfb926
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/platform_configs/cmake_platforms.yaml
View File

@@ -221,7 +221,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}}',