summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuhang Zhao <yuhangzhao@deepin.org>2023-10-26 17:03:31 +0800
committerYuhang Zhao <yuhangzhao@deepin.org>2023-11-02 12:26:59 +0000
commit7b77a1c2a68225d68041b6a342b3bb2df1482801 (patch)
tree0acd4e1c95e7ebc14543cb314f8337f613786dff
parentd7ebe91781b80c8f748ea56d7915f03e69916516 (diff)
QOSV: Add Win11 23H2
Windows 11 23H2 (10.0.22631) will be released publicly soon, it's better add it to Qt now. Pick-to: 6.6 Change-Id: I1bcec19d3a15e778f2c5e504d1e5cf678753f5a2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/corelib/global/qoperatingsystemversion.cpp6
-rw-r--r--src/corelib/global/qoperatingsystemversion.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp
index 257835e0bc..f09032227b 100644
--- a/src/corelib/global/qoperatingsystemversion.cpp
+++ b/src/corelib/global/qoperatingsystemversion.cpp
@@ -480,6 +480,12 @@ const QOperatingSystemVersionBase QOperatingSystemVersion::Windows11_21H2;
const QOperatingSystemVersionBase QOperatingSystemVersion::Windows11_22H2;
/*!
+ \variable QOperatingSystemVersion::Windows11_23H2
+ \brief a version corresponding to Windows 11 Version 23H2 (version 10.0.22631).
+ \since 6.6
+ */
+
+/*!
\variable QOperatingSystemVersion::OSXMavericks
\brief a version corresponding to OS X Mavericks (version 10.9).
\since 5.9
diff --git a/src/corelib/global/qoperatingsystemversion.h b/src/corelib/global/qoperatingsystemversion.h
index a360231208..a11c90072f 100644
--- a/src/corelib/global/qoperatingsystemversion.h
+++ b/src/corelib/global/qoperatingsystemversion.h
@@ -120,6 +120,7 @@ class QOperatingSystemVersion : public QOperatingSystemVersionBase
// ### Qt7: Regroup with the rest below
static constexpr QOperatingSystemVersionBase MacOSSonoma { QOperatingSystemVersionBase::MacOS, 14, 0 };
static constexpr QOperatingSystemVersionBase Android14 { QOperatingSystemVersionBase::Android, 14, 0 };
+ static constexpr QOperatingSystemVersionBase Windows11_23H2 { QOperatingSystemVersionBase::Windows, 10, 0, 22631 };
#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) && !defined(QT_BOOTSTRAPPED) && !defined(Q_QDOC)
};