lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-09-05 08:47:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update MinGW to v15.1.0 (x86_64)

Browse Source 
GCC = 15.1.0 MinGW = 12.0.0

Note: Win10 doesn't have MinGW targets anymore as those were moved
recently into Win11 (ddebcf8fd9)

But we still keep MinGW 15.1.0 installation as part of the Win10
provisioning as we did with Win11 before it had MinGW targets.

Reason is to keep installation working for just in case it's needed.

Pick-to: 6.12
Task-number: QTQAINFRA-7483
Change-Id: I2cb2e2ef180b11cad61a5131ec47ea2ad207f338
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Tim Blechmann <tim.blechmann@qt.io>
This commit is contained in:
Tero Heikkinen
2025-10-31 10:21:21 +02:00
committed by Elias Toivola
parent 8732522eea
commit 295083dd9b
14 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coin/platform_configs/cmake_platforms.yaml
+4 -4
View File
@@ -269,7 +269,7 @@ Configurations:
Compiler: 'MSVC2022'
Target arch: 'arm64'
Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Platform dependency: 'windows-11_24h2-mingw13'
Platform dependency: 'windows-11_24h2-mingw15'
Environment variables: [
'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer',
@@ -290,7 +290,7 @@ Configurations:
Compiler: 'MSVC2026'
Target arch: 'arm64'
Features: ['Sccache', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Platform dependency: 'windows-11_24h2-mingw13'
Platform dependency: 'windows-11_24h2-mingw15'
Environment variables: [
'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer',
@@ -420,7 +420,7 @@ Configurations:
'TARGET_CONFIGURE_ARGS=-developer-build -no-warnings-are-errors -nomake examples -nomake tests -platform macx-visionos-clang',
]
-
Id: 'windows-11_24h2-mingw13'
Id: 'windows-11_24h2-mingw15'
Template: 'qtci-windows-11_24H2-x86_64-73'
Compiler: 'Mingw'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
@@ -446,7 +446,7 @@ Configurations:
'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
]
-
Id: 'windows-11_24H2-mingw13-developer-build'
Id: 'windows-11_24H2-mingw15-developer-build'
Template: 'qtci-windows-11_24H2-x86_64-73'
Compiler: 'Mingw'
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
coin/platform_configs/cmake_platforms_target_android.yaml
+1 -1
View File
@@ -22,7 +22,7 @@ Configurations:
Target arch: 'armv7'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'windows-11_24h2-mingw13'
Platform dependency: 'windows-11_24h2-mingw15'
Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Environment variables: [
'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
coin/platform_configs/cmake_platforms_wasm.yaml
+1 -1
View File
@@ -19,7 +19,7 @@ Configurations:
Target os: 'WebAssembly'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'windows-11_24h2-mingw13'
Platform dependency: 'windows-11_24h2-mingw15'
Features: ['Packaging','DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Environment variables: [
'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
coin/platform_configs/nightly_android_ndk1.yaml
+1 -1
View File
@@ -2,7 +2,7 @@ Version: 2
Include: [
cmake_platforms.yaml: [
'rhel-9.6',
'windows-11_24h2-mingw13'
'windows-11_24h2-mingw15'
],
cmake_platforms_target_android.yaml: [
'android-15-x86_64-on-linux',
coin/platform_configs/nightly_android_ndk2.yaml
+1 -1
View File
@@ -2,7 +2,7 @@ Version: 2
Include: [
cmake_platforms.yaml: [
'rhel-9.6',
'windows-11_24h2-mingw13'
'windows-11_24h2-mingw15'
],
cmake_platforms_target_android.yaml: [
'android-15-x86_64-on-linux',
coin/platform_configs/nightly_qnx710_host_windows.yaml
+2 -2
View File
@@ -1,7 +1,7 @@
Version: 2
Include: [
cmake_platforms.yaml: [
'windows-11_24h2-mingw13'
'windows-11_24h2-mingw15'
]
]
Configurations:
@@ -12,7 +12,7 @@ Configurations:
Target arch: 'arm64'
Compiler: 'Mingw'
Target compiler: 'QCC'
Platform dependency: 'windows-11_24h2-mingw13'
Platform dependency: 'windows-11_24h2-mingw15'
Features: ['DisableTests', 'UseConfigure']
Environment variables: [
'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
coin/platform_configs/nightly_windows.yaml
+2 -2
View File
@@ -3,7 +3,7 @@ Configurations: []
Include: [
cmake_platforms.yaml: [
'windows-11_24H2-msvc2022-developer-build',
'windows-11_24H2-mingw13-developer-build',
'windows-11_24H2-mingw15-developer-build',
'windows-11_24H2-llvm'
]
]
@@ -13,7 +13,7 @@ Overrides:
Id: 'windows-11_24H2-msvc2022-developer-build'
Configure arguments: '-qtnamespace TestNamespace -debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
-
Id: 'windows-11_24H2-mingw13-developer-build'
Id: 'windows-11_24H2-mingw15-developer-build'
Configure arguments: '-qtnamespace TestNamespace -developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples'
-
Id: 'windows-11_24H2-llvm'
coin/platform_configs/qtsaferenderer-runtime.yaml
+2 -2
View File
@@ -12,8 +12,8 @@ Include: [
"sles-15_sp6-static",
"windows-10_22h2-msvc2022",
"rhel-9.6",
"windows-11_24h2-mingw13",
"windows-11_24H2-mingw13-developer-build",
"windows-11_24h2-mingw15",
"windows-11_24H2-mingw15-developer-build",
"windows-11_24H2-llvm",
"windows-11_24H2-msvc2022",
"windows-11_23h2-arm64-msvc2022"
coin/platform_configs/qtsaferenderer.yaml
+2 -2
View File
@@ -13,8 +13,8 @@ Include: [
"sles-15_sp6-static",
"windows-10_22h2-msvc2022",
"rhel-9.6",
"windows-11_24h2-mingw13",
"windows-11_24H2-mingw13-developer-build",
"windows-11_24h2-mingw15",
"windows-11_24H2-mingw15-developer-build",
"windows-11_24H2-llvm",
"windows-11_24H2-msvc2022",
"windows-11_23h2-arm64-msvc2022"
coin/platform_configs/tqtc-android-automotive.yaml
+1 -1
View File
@@ -3,7 +3,7 @@ Include: [
cmake_platforms.yaml: [
"documentation-warnings",
"rhel-9.6",
'windows-11_24h2-mingw13',
'windows-11_24h2-mingw15',
],
macos.yaml: [
'macos-universal-on-arm64'
coin/provisioning/qtci-windows-10_22H2-x86_64/09-install-mingw1310_64.ps1
-11
View File
@@ -1,11 +0,0 @@
. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
# This script will install 64-bit MinGW 13.1.0
# Note! MinGW version is 9.0.0 but the GCC version is 13.1 which is used with the naming of MinGW
$release = "MinGW-w64-x86_64-13.1.0-release-posix-seh-msvcrt-rt_v11-rev1"
$sha1 = "561db0989c1b2cb73e0ceb27aed3b0ee8cb1db48"
InstallMinGW $release $sha1
coin/provisioning/qtci-windows-10_22H2-x86_64/09-install-mingw1510_64.ps1
+11
View File
@@ -0,0 +1,11 @@
. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
# This script will install 64-bit MinGW 15.1.0
# Note! MinGW version is 12.0.0 but the GCC version is 15.1 which is used with the naming of MinGW
$release = "MinGW-w64-x86_64-15.1.0-release-posix-seh-msvcrt-rt_v12-rev0"
$sha1 = "2fbec5f4a0e46099a850b11780500d0208b10591"
InstallMinGW $release $sha1
coin/provisioning/qtci-windows-11_24H2-x86_64/09-install-mingw1310_64.ps1
-13
View File
@@ -1,13 +0,0 @@
# Copyright (C) 2025 The Qt Company Ltd
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
# This script will install 64-bit MinGW 13.1.0
# Note! MinGW version is 9.0.0 but the GCC version is 13.1 which is used with the naming of MinGW
$release = "MinGW-w64-x86_64-13.1.0-release-posix-seh-msvcrt-rt_v11-rev1"
$sha1 = "561db0989c1b2cb73e0ceb27aed3b0ee8cb1db48"
InstallMinGW $release $sha1
coin/provisioning/qtci-windows-11_24H2-x86_64/09-install-mingw1510_64.ps1
+13
View File
@@ -0,0 +1,13 @@
# Copyright (C) 2025 The Qt Company Ltd
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
# This script will install 64-bit MinGW 15.1.0
# Note! MinGW version is 12.0.0 but the GCC version is 15.1 which is used with the naming of MinGW
$release = "MinGW-w64-x86_64-15.1.0-release-posix-seh-msvcrt-rt_v12-rev0"
$sha1 = "2fbec5f4a0e46099a850b11780500d0208b10591"
InstallMinGW $release $sha1