From 367e4b33355646373d64a6d5d42c61d838d81f42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 10 Jun 2024 20:09:55 +0200 Subject: [PATCH] Add macOS Sequoia (15) to QOperatingSystemVersion Pick-to: 6.7 6.5 6.2 5.15 Change-Id: I8d0981a4e311162a2a5f80d10aa1c2c1528fb15c Reviewed-by: Volker Hilsheimer (cherry picked from commit d1d17cf070d156d6200e3642614ccacb702a20d1) 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 cf6063fca05..98e2f57357d 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -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). diff --git a/src/corelib/global/qoperatingsystemversion.h b/src/corelib/global/qoperatingsystemversion.h index a9f30dc2752..7a32fc93a99 100644 --- a/src/corelib/global/qoperatingsystemversion.h +++ b/src/corelib/global/qoperatingsystemversion.h @@ -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 };