lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-18 02:56:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Windows 10: Install Windows SDK 10.0.26100.1742

Browse Source 
Change Windows 10 22h2 x86_64 tier-1 template -52 -> -53, where Windows
SDK 10.0.26100.1742 is installed.

Task-number: QTQAINFRA-6862
Task-number: COIN-1206
Pick-to: 6.8
Change-Id: Ia78f8d3b67c3aa546a4f47ad503f44782722631f
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 75578f016a)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
This commit is contained in:
Elias Toivola
2024-12-12 00:45:17 +02:00
committed by Tero Heikkinen
parent 91ba03e3b5
commit 2c0ce8b3f2
9 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/platform_configs/cmake_platforms.yaml
View File

@@ -140,7 +140,7 @@ Configurations:
] ]
- -
Id: 'windows-10_22h2-msvc2022' Id: 'windows-10_22h2-msvc2022'
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-53'
Compiler: 'MSVC2022' Compiler: 'MSVC2022'
Features: ['PinCores', 'Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Features: ['PinCores', 'Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -236,7 +236,7 @@ Configurations:
] ]
- -
Id: 'windows-10_22h2-mingw13' Id: 'windows-10_22h2-mingw13'
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-53'
Compiler: 'Mingw' Compiler: 'Mingw'
Features: ['PinCores', 'Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Features: ['PinCores', 'Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'

2
coin/platform_configs/cmake_platforms_target_android.yaml
View File

@@ -17,7 +17,7 @@ Configurations:
] ]
- -
Id: 'android-armv7-on-windows' Id: 'android-armv7-on-windows'
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-53'
Target os: 'Android_ANY' Target os: 'Android_ANY'
Target arch: 'armv7' Target arch: 'armv7'
Compiler: 'Mingw' Compiler: 'Mingw'

2
coin/platform_configs/cmake_platforms_wasm.yaml
View File

@@ -14,7 +14,7 @@ Configurations:
] ]
- -
Id: 'webassembly-windows' Id: 'webassembly-windows'
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-53'
Target os: 'WebAssembly' Target os: 'WebAssembly'
Compiler: 'Mingw' Compiler: 'Mingw'
Target compiler: 'Clang' Target compiler: 'Clang'

2
coin/platform_configs/nightly_qnx710_host_windows.yaml
View File

@@ -7,7 +7,7 @@ Include: [
Configurations: Configurations:
- -
Id: 'qnx-710-arm64-on-windows' Id: 'qnx-710-arm64-on-windows'
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-53'
Target os: 'QNX_710' Target os: 'QNX_710'
Target arch: 'arm64' Target arch: 'arm64'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'

2
coin/platform_configs/qmake2cmake.yaml
View File

@@ -2,7 +2,7 @@ Version: 2
Module only: True Module only: True
Configurations: Configurations:
- -
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-53'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Features: ['DisableTests'] Features: ['DisableTests']
- -

6
coin/platform_configs/qt-creator.yaml
View File

@@ -2,7 +2,7 @@ Version: 2
Module only: True Module only: True
Configurations: Configurations:
- -
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-53'
Compiler: 'MSVC2022' Compiler: 'MSVC2022'
Features: ['Sccache', 'DebugAndRelease'] Features: ['Sccache', 'DebugAndRelease']
Configure arguments: '' Configure arguments: ''
@@ -28,7 +28,7 @@ Configurations:
Environment variables: [] Environment variables: []
# without tests # without tests
- -
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-53'
Compiler: 'MSVC2022' Compiler: 'MSVC2022'
Features: ['Sccache', 'DebugAndRelease', 'DisableTests'] Features: ['Sccache', 'DebugAndRelease', 'DisableTests']
Configure arguments: '' Configure arguments: ''
@@ -36,7 +36,7 @@ Configurations:
Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
# oldest Qt version # oldest Qt version
- -
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-53'
Compiler: 'MSVC2022' Compiler: 'MSVC2022'
Features: ['Sccache', 'DebugAndRelease', 'OldestQt'] Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
Configure arguments: '' Configure arguments: ''

2
coin/platform_configs/qtsaferenderer.yaml
View File

@@ -48,7 +48,7 @@ Configurations:
] ]
- -
Id: 'Windows-MSVC2022_Static' Id: 'Windows-MSVC2022_Static'
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-53'
Compiler: 'MSVC2022' Compiler: 'MSVC2022'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests'] Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-mysql -no-sql-odbc -no-sql-psql' Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-mysql -no-sql-odbc -no-sql-psql'

2
coin/platform_configs/qtwebkit.yaml
View File

@@ -1,7 +1,7 @@
Version: 2 Version: 2
Configurations: Configurations:
- -
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-53'
Compiler: 'Mingw' Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW1120_i686\mingw32\bin;$PATH'] Environment variables: ['PATH=C:\MINGW1120_i686\mingw32\bin;$PATH']
Features: ['Packaging', UseLegacyInstructions'] Features: ['Packaging', UseLegacyInstructions']

4
coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2022.txt
View File

@@ -56,6 +56,10 @@ Windows 10 SDK (10.0.22000.0)
Windows 10 SDK (10.0.22621.0) Windows 10 SDK (10.0.22621.0)
Windows Universal C Runtime Windows Universal C Runtime
Windows SDK (10.0.26100.1742) was later downloaded and installed from:
https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/
# COIN-1206
# NOTE! Work loads were added during installation! # NOTE! Work loads were added during installation!
############################################################ ############################################################