summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorYuhang Zhao <2546789017@qq.com>2022-10-19 16:50:24 +0800
committerYuhang Zhao <2546789017@qq.com>2022-10-20 08:16:42 +0000
commit2e582a0af9c918876c77a62ff827265e9d83e9bf (patch)
treee5cbac677e37ddd561a50d3e058efea7b71af5c8 /src/corelib/global
parent9efb27e40ce097f2c761b5e5f9c3b9a5c65b3a49 (diff)
QOperatingSystemVersion: add new Win10 version
Win10 22H2 is released already. Pick-to: 6.4 Change-Id: Ibd42ee5e8b6e4ceb3cb4f8ee237bd9cdd9473f66 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qoperatingsystemversion.cpp7
-rw-r--r--src/corelib/global/qoperatingsystemversion.h1
2 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp
index 05bcf2cd56..962489a101 100644
--- a/src/corelib/global/qoperatingsystemversion.cpp
+++ b/src/corelib/global/qoperatingsystemversion.cpp
@@ -441,6 +441,13 @@ const QOperatingSystemVersion QOperatingSystemVersion::Windows10 =
*/
/*!
+ \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
(version 10.0.22000).
diff --git a/src/corelib/global/qoperatingsystemversion.h b/src/corelib/global/qoperatingsystemversion.h
index 5277333fdf..78a525ace6 100644
--- a/src/corelib/global/qoperatingsystemversion.h
+++ b/src/corelib/global/qoperatingsystemversion.h
@@ -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 };