From 646912cac7a0a72940c6a0b041a94b4b1a98c160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Tue, 22 Aug 2023 15:29:44 +0200 Subject: [PATCH] Fix definition of QOSV::MacOSSonoma MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Tor Arne Vestbø (cherry picked from commit 5d8e0ce0fbe179b9f4e4ec46c209c746b57cbdf2) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/global/qoperatingsystemversion.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp index 044b1452f2b..0a68846f2f3 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -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