From 2e18882763315bcb9b959ff4dbc6815d2c33c0f7 Mon Sep 17 00:00:00 2001 From: Zhao Yuhang <2546789017@qq.com> Date: Fri, 4 Oct 2024 23:23:32 +0800 Subject: [PATCH] QOperatingSystemVersion: Add Win11 24H2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Windows 11 24H2 has been publicly released already, which can be downloaded directly from Microsoft's official website [1]. [1] https://www.microsoft.com/en-us/software-download/windows11 Change-Id: I0394e8413c07ec902cadd43bd2fac8a3d4c42c7b Reviewed-by: Mårten Nordheim Reviewed-by: Thiago Macieira (cherry picked from commit c846db292de94dda9dc58bf5e7697c75a0b0769f) Reviewed-by: Qt Cherry-pick Bot --- 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 98e2f57357d..9c3f7be1536 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -479,6 +479,12 @@ const QOperatingSystemVersionBase QOperatingSystemVersion::Windows11_22H2; \since 6.6 */ +/*! + \variable QOperatingSystemVersion::Windows11_24H2 + \brief a version corresponding to Windows 11 Version 24H2 (version 10.0.26100). + \since 6.8.1 + */ + /*! \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 15e63905619..0747093d600 100644 --- a/src/corelib/global/qoperatingsystemversion.h +++ b/src/corelib/global/qoperatingsystemversion.h @@ -145,6 +145,7 @@ class QOperatingSystemVersion : public QOperatingSystemVersionBase static constexpr QOperatingSystemVersionBase MacOSSequoia { QOperatingSystemVersionBase::MacOS, 15, 0 }; static constexpr QOperatingSystemVersionBase Android14 { QOperatingSystemVersionBase::Android, 14, 0 }; static constexpr QOperatingSystemVersionBase Windows11_23H2 { QOperatingSystemVersionBase::Windows, 10, 0, 22631 }; + static constexpr QOperatingSystemVersionBase Windows11_24H2 { QOperatingSystemVersionBase::Windows, 10, 0, 26100 }; #if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) && !defined(QT_BOOTSTRAPPED) && !defined(Q_QDOC) };