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

Fix definition of QOSV::MacOSSonoma

Browse Source 
Make sure that MacOSSonoma symbol is defined in
qoperatingsystemversion.cpp, instead of duplicating the
MacOSVentura symbol. This seems strictly speaking not
needed (as this shouldn't have compiled otherwise), but is
avoiding confusion in the future.

Also document when it got added (Qt 6.5).

Amends 0237709e2.

Change-Id: Idff7cbe0b5862907d735fb60f91f85469cb1edf0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 5d8e0ce0fbe179b9f4e4ec46c209c746b57cbdf2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Kai Köhne 2023-08-22 15:29:44 +02:00 committed by Qt Cherry-pick Bot
parent bbae65a75d
commit 646912cac7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -561,8 +561,9 @@ const QOperatingSystemVersionBase QOperatingSystemVersion::MacOSVentura;
/*!
\variable QOperatingSystemVersion::MacOSSonoma
\brief a version corresponding to macOS Sonoma (version 14).
\since 6.5
*/
const QOperatingSystemVersionBase QOperatingSystemVersion::MacOSVentura;
const QOperatingSystemVersionBase QOperatingSystemVersion::MacOSSonoma;
/*!
\variable QOperatingSystemVersion::AndroidJellyBean