From cebb7bdac73723d74e65be3b43a2bd1f36c1b668 Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <2546789017@qq.com>
Date: Wed, 15 Jun 2022 15:04:07 +0800
Subject: [PATCH] QOperatingSystemVersion: Add new Windows version

And also update some docs to provide more detailed info.

Change-Id: I7b51fcb6613399cb4f1dd5d75cf3168df195577b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 7225ed749da2e60b3cdd9b509d0291a0e87ba94e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../global/qoperatingsystemversion.cpp        | 38 ++++++++++++++-----
 src/corelib/global/qoperatingsystemversion.h  |  2 +
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp
index 58c683e54d6..a89cfa88d2c 100644
--- a/src/corelib/global/qoperatingsystemversion.cpp
+++ b/src/corelib/global/qoperatingsystemversion.cpp
@@ -382,7 +382,7 @@ const QOperatingSystemVersion QOperatingSystemVersion::Windows8_1 =
 
 /*!
     \variable QOperatingSystemVersion::Windows10
-    \brief a version corresponding to Windows 10 (version 10.0).
+    \brief a version corresponding to general Windows 10 (version 10.0).
     \since 5.9
  */
 const QOperatingSystemVersion QOperatingSystemVersion::Windows10 =
@@ -390,52 +390,72 @@ const QOperatingSystemVersion QOperatingSystemVersion::Windows10 =
 
 /*!
     \variable QOperatingSystemVersion::Windows10_1809
-    \brief a version corresponding to Windows 10 1809 (version 10.0.17763).
+    \brief a version corresponding to Windows 10 October 2018 Update
+           Version 1809 (version 10.0.17763).
     \since 6.3
  */
 
 /*!
     \variable QOperatingSystemVersion::Windows10_1903
-    \brief a version corresponding to Windows 10 1903 (version 10.0.18362).
+    \brief a version corresponding to Windows 10 May 2019 Update
+           Version 1903 (version 10.0.18362).
     \since 6.3
  */
 
 /*!
     \variable QOperatingSystemVersion::Windows10_1909
-    \brief a version corresponding to Windows 10 1909 (version 10.0.18363).
+    \brief a version corresponding to Windows 10 November 2019 Update
+           Version 1909 (version 10.0.18363).
     \since 6.3
  */
 
 /*!
     \variable QOperatingSystemVersion::Windows10_2004
-    \brief a version corresponding to Windows 10 2004 (version 10.0.19041).
+    \brief a version corresponding to Windows 10 May 2020 Update
+           Version 2004 (version 10.0.19041).
     \since 6.3
  */
 
 /*!
     \variable QOperatingSystemVersion::Windows10_20H2
-    \brief a version corresponding to Windows 10 20H2 (version 10.0.19042).
+    \brief a version corresponding to Windows 10 October 2020 Update
+           Version 20H2 (version 10.0.19042).
     \since 6.3
  */
 
 /*!
     \variable QOperatingSystemVersion::Windows10_21H1
-    \brief a version corresponding to Windows 10 21H1 (version 10.0.19043).
+    \brief a version corresponding to Windows 10 May 2021 Update
+           Version 21H1 (version 10.0.19043).
     \since 6.3
  */
 
 /*!
     \variable QOperatingSystemVersion::Windows10_21H2
-    \brief a version corresponding to Windows 10 21H2 (version 10.0.19044).
+    \brief a version corresponding to Windows 10 November 2021 Update
+           Version 21H2 (version 10.0.19044).
     \since 6.3
  */
 
 /*!
     \variable QOperatingSystemVersion::Windows11
-    \brief a version corresponding to Windows 11 (version 10.0.22000).
+    \brief a version corresponding to the initial release of Windows 11
+           (version 10.0.22000).
     \since 6.3
  */
 
+/*!
+    \variable QOperatingSystemVersion::Windows11_21H2
+    \brief a version corresponding to Windows 11 Version 21H2 (version 10.0.22000).
+    \since 6.4
+ */
+
+/*!
+    \variable QOperatingSystemVersion::Windows11_22H2
+    \brief a version corresponding to Windows 11 Version 22H2 (version 10.0.22621).
+    \since 6.4
+ */
+
 /*!
     \variable QOperatingSystemVersion::OSXMavericks
     \brief a version corresponding to OS X Mavericks (version 10.9).
diff --git a/src/corelib/global/qoperatingsystemversion.h b/src/corelib/global/qoperatingsystemversion.h
index 3cecc94bf88..5fcc3411de5 100644
--- a/src/corelib/global/qoperatingsystemversion.h
+++ b/src/corelib/global/qoperatingsystemversion.h
@@ -196,6 +196,8 @@ public:
     static constexpr QOperatingSystemVersionBase Windows10_21H1 { QOperatingSystemVersionBase::Windows, 10, 0, 19043 };
     static constexpr QOperatingSystemVersionBase Windows10_21H2 { QOperatingSystemVersionBase::Windows, 10, 0, 19044 };
     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 };
 
     constexpr QOperatingSystemVersion(const QOperatingSystemVersionBase &osversion)
         : QOperatingSystemVersionBase(osversion) {}