From 6910ca44cda8ca17fa2b5f30b45cb93b728e640d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Sun, 8 Jun 2025 11:10:30 -0700 Subject: [PATCH] Add QOperatingSystemVersion/QSysInfo support for macOS 26 (Tahoe) Pick-to: 6.8 6.5 Change-Id: If6e7ee92e7c491c91a17e2730112319a132ca623 Reviewed-by: Thiago Macieira (cherry picked from commit f67ef4934b948bbd4d15a2d90ad7172798abb691) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 1c82a674bb0f6ad5e443b27999724a54a3fcab7a) --- src/corelib/global/qoperatingsystemversion.cpp | 6 ++++++ src/corelib/global/qoperatingsystemversion.h | 1 + src/corelib/global/qsysinfo.cpp | 1 + 3 files changed, 8 insertions(+) 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 @@ -576,6 +576,12 @@ const QOperatingSystemVersionBase QOperatingSystemVersion::MacOSVentura; \since 6.8 */ +/*! + \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). 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 32bd91c460b..abc07db3e35 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;