AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add operating system version for macOS 12 "Monterey"

Browse Source 
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>
This commit is contained in:
Volker Hilsheimer 2021-11-09 22:37:54 +01:00
parent f7fd57075b
commit b3dc0fec2b
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/global/qoperatingsystemversion.cpp
View File

@ -543,6 +543,14 @@ const QOperatingSystemVersion QOperatingSystemVersion::MacOSBigSur = [] {
return QOperatingSystemVersion(QOperatingSystemVersion::MacOS, 10, 16); return QOperatingSystemVersion(QOperatingSystemVersion::MacOS, 10, 16);
}(); }();
/*!
\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 \variable QOperatingSystemVersion::AndroidJellyBean
\brief a version corresponding to Android Jelly Bean (version 4.1, API level 16). \brief a version corresponding to Android Jelly Bean (version 4.1, API level 16).

2
src/corelib/global/qoperatingsystemversion.h
View File

@ -171,6 +171,7 @@ public:
static const QOperatingSystemVersion MacOSMojave; static const QOperatingSystemVersion MacOSMojave;
static const QOperatingSystemVersion MacOSCatalina; static const QOperatingSystemVersion MacOSCatalina;
static const QOperatingSystemVersion MacOSBigSur; static const QOperatingSystemVersion MacOSBigSur;
static const QOperatingSystemVersion MacOSMonterey;
static const QOperatingSystemVersion AndroidJellyBean; static const QOperatingSystemVersion AndroidJellyBean;
static const QOperatingSystemVersion AndroidJellyBean_MR1; static const QOperatingSystemVersion AndroidJellyBean_MR1;
@ -201,6 +202,7 @@ public:
static constexpr QOperatingSystemVersionBase MacOSCatalina { QOperatingSystemVersionBase::MacOS, 10, 15 }; static constexpr QOperatingSystemVersionBase MacOSCatalina { QOperatingSystemVersionBase::MacOS, 10, 15 };
#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_11_0) #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_11_0)
static constexpr QOperatingSystemVersionBase MacOSBigSur = { QOperatingSystemVersionBase::MacOS, 11, 0 }; static constexpr QOperatingSystemVersionBase MacOSBigSur = { QOperatingSystemVersionBase::MacOS, 11, 0 };
static constexpr QOperatingSystemVersionBase MacOSMonterey = { QOperatingSystemVersionBase::MacOS, 12, 0 };
#else // ### Qt 7: Verify the assumption #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 # error Either you are using an outdated SDK or my assumption that Qt7 would require at least 11.0 was wrong
#endif #endif