From 919f5bd459e98c9080c6fb413a916cecdf29a2b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Fri, 22 Oct 2021 15:30:48 +0200 Subject: [PATCH] QOperatingSystemVersion: Add Windows11 Change-Id: Ieb7674bbbbc78689f1e2a1e5a06dfd4d0ce25ac1 Reviewed-by: Yuhang Zhao <2546789017@qq.com> Reviewed-by: Thiago Macieira --- src/corelib/global/qoperatingsystemversion.cpp | 6 ++++++ src/corelib/global/qoperatingsystemversion.h | 1 + 2 files changed, 7 insertions(+) diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp index b714451056..82c6319b2f 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -466,6 +466,12 @@ const QOperatingSystemVersion QOperatingSystemVersion::Windows10 = \since 6.3 */ +/*! + \variable QOperatingSystemVersion::Windows11 + \brief a version corresponding to Windows 11 (version 10.0.22000). + \since 6.3 + */ + /*! \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 0218b74d7f..3075723c42 100644 --- a/src/corelib/global/qoperatingsystemversion.h +++ b/src/corelib/global/qoperatingsystemversion.h @@ -230,6 +230,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 Windows11 { QOperatingSystemVersionBase::Windows, 10, 0, 22000 }; constexpr QOperatingSystemVersion(const QOperatingSystemVersionBase &osversion) : QOperatingSystemVersionBase(osversion) {}