From 9fb81b27758e827f68c340a0bb147b13509adfaa Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 23 Dec 2021 08:59:24 -0300 Subject: [PATCH] Doc: QSysInfo::productType: remove the "will be" note about Qt 6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: QTBUG-99413 Change-Id: Ib42b3adc93bf4d43bd55fffd16c360797871011b Reviewed-by: Tor Arne Vestbø (cherry picked from commit 60db7a5dc1a52f025e6ae6a78ee36803a62cfcb6) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/global/qglobal.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 388bccac0d3..1671d3d6777 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -2759,10 +2759,9 @@ QString QSysInfo::kernelVersion() to determine the distribution name and returns that. If determining the distribution name failed, it returns "unknown". - \b{\macos note}: this function returns "osx" for all \macos systems, - regardless of Apple naming convention. The returned string will be updated - for Qt 6. Note that this function erroneously returned "macos" for \macos - 10.12 in Qt versions 5.6.2, 5.7.1, and 5.8.0. + \b{\macos note}: this function returns "macos" for all \macos systems, + regardless of Apple naming convention. Previously, in Qt 5, it returned + "osx", again regardless of Apple naming conventions. \b{Darwin, iOS, tvOS, and watchOS note}: this function returns "ios" for iOS systems, "tvos" for tvOS systems, "watchos" for watchOS systems, and