From bc6e0d1e00c7e5b49f1b06a1747da7be34ff3193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Mon, 24 Oct 2022 14:33:41 +0200 Subject: [PATCH] QOperatingSystemVersion: Add macOS Ventura (13.0) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Altered cherry-pick slightly to accommodate documentation suggestion for 6.4. Change-Id: I9504b41b743b9874fcc6324d98b66a9c5160e845 Reviewed-by: Timur Pocheptsov Reviewed-by: Tor Arne Vestbø (cherry picked from commit 486651db3c2d5cce4399dc4f58ce7d78a94ef950) Reviewed-by: Thiago Macieira --- src/corelib/global/qoperatingsystemversion.cpp | 6 ++++++ src/corelib/global/qoperatingsystemversion.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp index 4b63cdd11c2..bfd31ac4286 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -548,6 +548,12 @@ const QOperatingSystemVersion QOperatingSystemVersion::MacOSBigSur = [] { const QOperatingSystemVersion QOperatingSystemVersion::MacOSMonterey = QOperatingSystemVersion(QOperatingSystemVersion::MacOS, 12, 0); +/*! + \variable QOperatingSystemVersion::MacOSVentura + \brief a version corresponding to macOS Ventura (version 13). + \since 6.4 +*/ + /*! \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 921995e9ce1..32dc97db702 100644 --- a/src/corelib/global/qoperatingsystemversion.h +++ b/src/corelib/global/qoperatingsystemversion.h @@ -200,6 +200,8 @@ public: static constexpr QOperatingSystemVersionBase Windows11_21H2 = Windows11; static constexpr QOperatingSystemVersionBase Windows11_22H2 { QOperatingSystemVersionBase::Windows, 10, 0, 22621 }; + static constexpr QOperatingSystemVersionBase MacOSVentura { QOperatingSystemVersionBase::MacOS, 13, 0 }; + constexpr QOperatingSystemVersion(const QOperatingSystemVersionBase &osversion) : QOperatingSystemVersionBase(osversion) {}