1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QOperatingSystemVersion: add new Win10 version

Browse Source 
Win10 22H2 is released already.

Change-Id: Ibd42ee5e8b6e4ceb3cb4f8ee237bd9cdd9473f66
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 2e582a0af9c918876c77a62ff827265e9d83e9bf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Yuhang Zhao 2022-10-19 16:50:24 +08:00 committed by Qt Cherry-pick Bot
parent cbdcdc345f
commit 4bf9f4bc6e
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/global/qoperatingsystemversion.cpp
View File

@ -437,6 +437,13 @@ const QOperatingSystemVersion QOperatingSystemVersion::Windows10 =
\since 6.3
*/
/*!
\variable QOperatingSystemVersion::Windows10_22H2
\brief a version corresponding to Windows 10 October 2022 Update
Version 22H2 (version 10.0.19045).
\since 6.5
*/
/*!
\variable QOperatingSystemVersion::Windows11
\brief a version corresponding to the initial release of Windows 11

1
src/corelib/global/qoperatingsystemversion.h
View File

@ -195,6 +195,7 @@ public:
static constexpr QOperatingSystemVersionBase Windows10_20H2 { QOperatingSystemVersionBase::Windows, 10, 0, 19042 };
static constexpr QOperatingSystemVersionBase Windows10_21H1 { QOperatingSystemVersionBase::Windows, 10, 0, 19043 };
static constexpr QOperatingSystemVersionBase Windows10_21H2 { QOperatingSystemVersionBase::Windows, 10, 0, 19044 };
static constexpr QOperatingSystemVersionBase Windows10_22H2 { QOperatingSystemVersionBase::Windows, 10, 0, 19045 };
static constexpr QOperatingSystemVersionBase Windows11 { QOperatingSystemVersionBase::Windows, 10, 0, 22000 };
static constexpr QOperatingSystemVersionBase Windows11_21H2 = Windows11;
static constexpr QOperatingSystemVersionBase Windows11_22H2 { QOperatingSystemVersionBase::Windows, 10, 0, 22621 };