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

Doc: QSysInfo::productType: remove the "will be" note about Qt 6

Browse Source 
Fixes: QTBUG-99413
Change-Id: Ib42b3adc93bf4d43bd55fffd16c360797871011b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 60db7a5dc1a52f025e6ae6a78ee36803a62cfcb6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2021-12-23 08:59:24 -03:00 committed by Qt Cherry-pick Bot
parent b3ce014683
commit 9fb81b2775
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/global/qglobal.cpp
View File

@ -2759,10 +2759,9 @@ QString QSysInfo::kernelVersion()
to determine the distribution name and returns that. If determining the to determine the distribution name and returns that. If determining the
distribution name failed, it returns "unknown". distribution name failed, it returns "unknown".
\b{\macos note}: this function returns "osx" for all \macos systems, \b{\macos note}: this function returns "macos" for all \macos systems,
regardless of Apple naming convention. The returned string will be updated regardless of Apple naming convention. Previously, in Qt 5, it returned
for Qt 6. Note that this function erroneously returned "macos" for \macos "osx", again regardless of Apple naming conventions.
10.12 in Qt versions 5.6.2, 5.7.1, and 5.8.0.
\b{Darwin, iOS, tvOS, and watchOS note}: this function returns "ios" for \b{Darwin, iOS, tvOS, and watchOS note}: this function returns "ios" for
iOS systems, "tvos" for tvOS systems, "watchos" for watchOS systems, and iOS systems, "tvos" for tvOS systems, "watchos" for watchOS systems, and