diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2022-10-24 14:33:41 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2022-10-28 16:51:09 +0000 |
| commit | bc6e0d1e00c7e5b49f1b06a1747da7be34ff3193 (patch) | |
| tree | 8128d30a7f3d77ced61c2d42fbf172fc8b75c273 /src/corelib | |
| parent | 3a08518224649c94f4625c70ee654b0fedcc5df2 (diff) | |
| download | qtbase-bc6e0d1e00c7e5b49f1b06a1747da7be34ff3193.tar.gz | |
QOperatingSystemVersion: Add macOS Ventura (13.0)
Altered cherry-pick slightly to accommodate documentation suggestion for
6.4.
Change-Id: I9504b41b743b9874fcc6324d98b66a9c5160e845
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 486651db3c2d5cce4399dc4f58ce7d78a94ef950)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp index 4b63cdd11c..bfd31ac428 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -549,6 +549,12 @@ 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). \since 5.9 diff --git a/src/corelib/global/qoperatingsystemversion.h b/src/corelib/global/qoperatingsystemversion.h index 921995e9ce..32dc97db70 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) {} |