whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix definition of QOSV::MacOSSonoma 

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.

Pick-to: 6.5 6.6
Change-Id: Idff7cbe0b5862907d735fb60f91f85469cb1edf0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
bb10
Kai Köhne 2023-08-22 15:29:44 +02:00
parent 3c4c7860f0
commit 5d8e0ce0fb
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