diff options
author | Elias Toivola <elias.toivola@qt.io> | 2023-06-14 16:19:41 +0300 |
---|---|---|
committer | Elias Toivola <elias.toivola@qt.io> | 2023-12-11 13:14:06 +0200 |
commit | 0b70b8f3c43a7c51061405006e72c371548d9eb5 (patch) | |
tree | 490220faa7161994cc70ef7f842dd7be7187647d /coin/platform_configs | |
parent | 25eb7f8a36a0a3d192a9324719922f7e0f1003cf (diff) |
Update MinGW to v13.1.0 (x86_64)
Task-number: QTQAINFRA-5045
Change-Id: Id63e375faf2ed984c461ff4eab6271187672c3ea
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin/platform_configs')
5 files changed, 13 insertions, 13 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index e6cbccfb..13103eef 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -205,13 +205,13 @@ Configurations: 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', ] - - Id: 'windows-10_22h2-mingw11' + Id: 'windows-10_22h2-mingw13' Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'Mingw' Features: ['Packaging', 'Sccache', 'UseConfigure'] Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' Environment variables: [ - 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', + 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DFEATURE_native_grpc=OFF -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', @@ -244,26 +244,26 @@ Configurations: 'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}', ] - - Id: 'windows-10_22h2-mingw11-developer-build' + Id: 'windows-10_22h2-mingw13-developer-build' Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'Mingw' Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples' Environment variables: [ - 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', + 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', ] - - Id: 'windows-11_22h2-mingw11-developer-build' + Id: 'windows-11_22h2-mingw13-developer-build' Template: 'qtci-windows-11_22H2-x86_64-51' Compiler: 'Mingw' Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples' Environment variables: [ - 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', + 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 609b6061..89f85eb1 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -22,10 +22,10 @@ Configurations: Target arch: 'armv7' Compiler: 'Mingw' Target compiler: 'Clang' - Platform dependency: 'windows-10_22h2-mingw11' + Platform dependency: 'windows-10_22h2-mingw13' Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure'] Environment variables: [ - 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', + 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include', diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index a2e1fe10..b3e12377 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -18,10 +18,10 @@ Configurations: Target os: 'WebAssembly' Compiler: 'Mingw' Target compiler: 'Clang' - Platform dependency: 'windows-10_22h2-mingw11' + Platform dependency: 'windows-10_22h2-mingw13' Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ - 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}', + 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples', 'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index b5407b9c..6bd99bc3 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -14,8 +14,8 @@ Include: [ "windows-10_22h2-msvc2022", "windows-10_22h2-msvc2019-developer-build", "rhel-8.8", - "windows-10_22h2-mingw11", - "windows-10_22h2-mingw11-developer-build", + "windows-10_22h2-mingw13", + "windows-10_22h2-mingw13-developer-build", "windows-10_22h2-llvm", "windows-11_22h2-msvc2019" ], diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 7ebef271..84746b6b 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -2,7 +2,7 @@ Version: 2 Include: [ cmake_platforms.yaml: [ 'rhel-8.8', - 'windows-10_22h2-mingw11', + 'windows-10_22h2-mingw13', 'ubuntu-22.04-documentation', 'ubuntu-22.04-documentation-x11-tests' ], |