From 54208c3a807e4647c28312e109059d6a34eb0034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 6 Jun 2023 13:13:05 +0200 Subject: [PATCH] Add QOperatingSystemVersion::MacOSSonoma for macOS 14 Change-Id: I22d4a2443e10ef40f498aa48aabad9aaa7aa8d1a Reviewed-by: Volker Hilsheimer (cherry picked from commit 0237709e2cde08ce792081615250377295722e19) 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 c57483273fd..044b1452f2b 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -558,6 +558,12 @@ const QOperatingSystemVersion QOperatingSystemVersion::MacOSMonterey = */ const QOperatingSystemVersionBase QOperatingSystemVersion::MacOSVentura; +/*! + \variable QOperatingSystemVersion::MacOSSonoma + \brief a version corresponding to macOS Sonoma (version 14). +*/ +const QOperatingSystemVersionBase QOperatingSystemVersion::MacOSVentura; + /*! \variable QOperatingSystemVersion::AndroidJellyBean \brief a version corresponding to Android Jelly Bean (version 4.1, API level 16). diff --git a/src/corelib/global/qoperatingsystemversion.h b/src/corelib/global/qoperatingsystemversion.h index 80a4cbbacb9..dc830f9736b 100644 --- a/src/corelib/global/qoperatingsystemversion.h +++ b/src/corelib/global/qoperatingsystemversion.h @@ -201,6 +201,7 @@ public: static constexpr QOperatingSystemVersionBase Android13 { QOperatingSystemVersionBase::Android, 13, 0 }; static constexpr QOperatingSystemVersionBase MacOSVentura { QOperatingSystemVersionBase::MacOS, 13, 0 }; + static constexpr QOperatingSystemVersionBase MacOSSonoma { QOperatingSystemVersionBase::MacOS, 14, 0 }; constexpr QOperatingSystemVersion(const QOperatingSystemVersionBase &osversion) : QOperatingSystemVersionBase(osversion) {}