1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add QOperatingSystemVersion/QSysInfo support for macOS 26 (Tahoe)

Browse Source 
Pick-to: 6.8 6.5
Change-Id: If6e7ee92e7c491c91a17e2730112319a132ca623
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit f67ef4934b948bbd4d15a2d90ad7172798abb691)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 1c82a674bb0f6ad5e443b27999724a54a3fcab7a)
This commit is contained in:
Tor Arne Vestbø 2025-06-08 11:10:30 -07:00 committed by Qt Cherry-pick Bot
parent defdceb00c
commit 6910ca44cd
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -576,6 +576,12 @@ const QOperatingSystemVersionBase QOperatingSystemVersion::MacOSVentura;
\since 6.8 \since 6.8
*/ */
/*!
\variable QOperatingSystemVersion::MacOSTahoe
\brief a version corresponding to macOS Tahoe (version 26).
\since 6.10
*/
/*! /*!
\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).

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

@ -144,6 +144,7 @@ public:
// ### Qt7: Regroup with the rest below // ### Qt7: Regroup with the rest below
static constexpr QOperatingSystemVersionBase MacOSSonoma { QOperatingSystemVersionBase::MacOS, 14, 0 }; static constexpr QOperatingSystemVersionBase MacOSSonoma { QOperatingSystemVersionBase::MacOS, 14, 0 };
static constexpr QOperatingSystemVersionBase MacOSSequoia { QOperatingSystemVersionBase::MacOS, 15, 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 Android14 { QOperatingSystemVersionBase::Android, 14, 0 };
static constexpr QOperatingSystemVersionBase Windows11_23H2 { QOperatingSystemVersionBase::Windows, 10, 0, 22631 }; static constexpr QOperatingSystemVersionBase Windows11_23H2 { QOperatingSystemVersionBase::Windows, 10, 0, 22631 };
static constexpr QOperatingSystemVersionBase Windows11_24H2 { QOperatingSystemVersionBase::Windows, 10, 0, 26100 }; static constexpr QOperatingSystemVersionBase Windows11_24H2 { QOperatingSystemVersionBase::Windows, 10, 0, 26100 };

1
src/corelib/global/qsysinfo.cpp
View File

@ -111,6 +111,7 @@ static const char *osVer_helper(QOperatingSystemVersion version = QOperatingSyst
case 13: return "Ventura"; case 13: return "Ventura";
case 14: return "Sonoma"; case 14: return "Sonoma";
case 15: return "Sequoia"; case 15: return "Sequoia";
case 26: return "Tahoe";
default: default:
// Unknown, future version // Unknown, future version
break; break;