diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-11-09 22:37:54 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-11-18 22:53:21 +0100 |
| commit | b3dc0fec2bdc8ab03107f906a94850b1b94b53af (patch) | |
| tree | 0b09bf67e7d4c4e16902972b6ac411f08bff3cb7 /src/corelib/global | |
| parent | f7fd57075be0f504cad46e9a2e78caf3d54979af (diff) | |
Add operating system version for macOS 12 "Monterey"
With pre-11 SDKs, macOS reports version 10.16, which already matches
BigSur, so we only match Monterey if version 12 is reported.
Change-Id: I37fee43756310370444981212750cdfe7fad64b8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion.cpp | 8 | ||||
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion.h | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp index 3942e0e9bb..b714451056 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -544,6 +544,14 @@ const QOperatingSystemVersion QOperatingSystemVersion::MacOSBigSur = [] { }(); /*! + \variable QOperatingSystemVersion::MacOSMonterey + \brief a version corresponding to macOS Monterey (version 12). + \since 6.3 + */ +const QOperatingSystemVersion QOperatingSystemVersion::MacOSMonterey = + QOperatingSystemVersion(QOperatingSystemVersion::MacOS, 12, 0); + +/*! \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 040df61de4..0218b74d7f 100644 --- a/src/corelib/global/qoperatingsystemversion.h +++ b/src/corelib/global/qoperatingsystemversion.h @@ -171,6 +171,7 @@ public: static const QOperatingSystemVersion MacOSMojave; static const QOperatingSystemVersion MacOSCatalina; static const QOperatingSystemVersion MacOSBigSur; + static const QOperatingSystemVersion MacOSMonterey; static const QOperatingSystemVersion AndroidJellyBean; static const QOperatingSystemVersion AndroidJellyBean_MR1; @@ -201,6 +202,7 @@ public: static constexpr QOperatingSystemVersionBase MacOSCatalina { QOperatingSystemVersionBase::MacOS, 10, 15 }; #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_11_0) static constexpr QOperatingSystemVersionBase MacOSBigSur = { QOperatingSystemVersionBase::MacOS, 11, 0 }; + static constexpr QOperatingSystemVersionBase MacOSMonterey = { QOperatingSystemVersionBase::MacOS, 12, 0 }; #else // ### Qt 7: Verify the assumption # error Either you are using an outdated SDK or my assumption that Qt7 would require at least 11.0 was wrong #endif |