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

Add macOS Sequoia (15) to QOperatingSystemVersion

Browse Source 
Pick-to: 6.7 6.5 6.2 5.15
Change-Id: I8d0981a4e311162a2a5f80d10aa1c2c1528fb15c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit d1d17cf070d156d6200e3642614ccacb702a20d1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2024-06-10 20:09:55 +02:00 committed by Qt Cherry-pick Bot
parent 22518b26c9
commit 367e4b3335
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

@ -564,6 +564,12 @@ const QOperatingSystemVersionBase QOperatingSystemVersion::MacOSVentura;
\since 6.5
*/
/*!
\variable QOperatingSystemVersion::MacOSSequoia
\brief a version corresponding to macOS Sequoia (version 15).
\since 6.8
*/
/*!
\variable QOperatingSystemVersion::AndroidJellyBean
\brief a version corresponding to Android Jelly Bean (version 4.1, API level 16).

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

@ -142,6 +142,7 @@ class QOperatingSystemVersion : public QOperatingSystemVersionBase
// ### Qt7: Regroup with the rest below
static constexpr QOperatingSystemVersionBase MacOSSonoma { QOperatingSystemVersionBase::MacOS, 14, 0 };
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 };