1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QOperatingSystemVersion: Add Win11 24H2

Browse Source 
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 <marten.nordheim@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit c846db292de94dda9dc58bf5e7697c75a0b0769f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Zhao Yuhang 2024-10-04 23:23:32 +08:00 committed by Qt Cherry-pick Bot
parent 768c49a7e9
commit 2e18882763
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/global/qoperatingsystemversion.cpp
View File

@ -479,6 +479,12 @@ const QOperatingSystemVersionBase QOperatingSystemVersion::Windows11_22H2;
\since 6.6 \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 \variable QOperatingSystemVersion::OSXMavericks
\brief a version corresponding to OS X Mavericks (version 10.9). \brief a version corresponding to OS X Mavericks (version 10.9).

1
src/corelib/global/qoperatingsystemversion.h
View File

@ -145,6 +145,7 @@ class QOperatingSystemVersion : public QOperatingSystemVersionBase
static constexpr QOperatingSystemVersionBase MacOSSequoia { QOperatingSystemVersionBase::MacOS, 15, 0 }; static constexpr QOperatingSystemVersionBase MacOSSequoia { QOperatingSystemVersionBase::MacOS, 15, 0 };
static constexpr QOperatingSystemVersionBase Android14 { QOperatingSystemVersionBase::Android, 14, 0 }; static constexpr QOperatingSystemVersionBase Android14 { QOperatingSystemVersionBase::Android, 14, 0 };
static constexpr QOperatingSystemVersionBase Windows11_23H2 { QOperatingSystemVersionBase::Windows, 10, 0, 22631 }; 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) #if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) && !defined(QT_BOOTSTRAPPED) && !defined(Q_QDOC)
}; };