diff options
| author | Tor Arne Vestbø <[email protected]> | 2025-06-08 11:10:30 -0700 |
|---|---|---|
| committer | Tor Arne Vestbø <[email protected]> | 2025-06-10 11:11:54 -0700 |
| commit | f67ef4934b948bbd4d15a2d90ad7172798abb691 (patch) | |
| tree | 64be7b3ca5a6ddf090800079a475ffa0b586af9f | |
| parent | 372a8f904a0bddd64ab474bb15fa56d29e2f04e1 (diff) | |
Add QOperatingSystemVersion/QSysInfo support for macOS 26 (Tahoe)
Pick-to: 6.10 6.9 6.8 6.5
Change-Id: If6e7ee92e7c491c91a17e2730112319a132ca623
Reviewed-by: Thiago Macieira <[email protected]>
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion.h | 1 | ||||
| -rw-r--r-- | src/corelib/global/qsysinfo.cpp | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp index 9c3f7be1536..a7d8dcfca30 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -577,6 +577,12 @@ const QOperatingSystemVersionBase QOperatingSystemVersion::MacOSVentura; */ /*! + \variable QOperatingSystemVersion::MacOSTahoe + \brief a version corresponding to macOS Tahoe (version 26). + \since 6.10 +*/ + +/*! \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 e02266a1378..6a67b54e01f 100644 --- a/src/corelib/global/qoperatingsystemversion.h +++ b/src/corelib/global/qoperatingsystemversion.h @@ -144,6 +144,7 @@ public: // ### 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 MacOSTahoe { QOperatingSystemVersionBase::MacOS, 26, 0 }; static constexpr QOperatingSystemVersionBase Android14 { QOperatingSystemVersionBase::Android, 14, 0 }; static constexpr QOperatingSystemVersionBase Windows11_23H2 { QOperatingSystemVersionBase::Windows, 10, 0, 22631 }; static constexpr QOperatingSystemVersionBase Windows11_24H2 { QOperatingSystemVersionBase::Windows, 10, 0, 26100 }; diff --git a/src/corelib/global/qsysinfo.cpp b/src/corelib/global/qsysinfo.cpp index ad8f52c260b..fcd8663d7a6 100644 --- a/src/corelib/global/qsysinfo.cpp +++ b/src/corelib/global/qsysinfo.cpp @@ -111,6 +111,7 @@ static const char *osVer_helper(QOperatingSystemVersion version = QOperatingSyst case 13: return "Ventura"; case 14: return "Sonoma"; case 15: return "Sequoia"; + case 26: return "Tahoe"; default: // Unknown, future version break; |