mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-21 07:28:21 +08:00
Revert "Add no-opengl to cross-compile WoA"
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
Pick-to: dev
Change-Id: Iaeb1dfa93e33a1f2d94357c6b4c9116e7633fd3f
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
This commit is contained in:
@@ -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}}',
|
||||
|
||||
Reference in New Issue
Block a user