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

QSysInfo: update docs to mention the latest os

Browse Source 
Update to the latest stable version.
Beta/preview versions not included.

Removed Amazon Linux AMI because it's no longer maintained.
Removed tvOS because it now shares the same version with iOS and iPadOS.

Change-Id: I40e5286b132b8198bf315a2868f89428e8c2f23a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 14ce67629bd36f75b2a9a0b3caf5c4c5d59abeac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Yuhang Zhao 2022-07-08 17:41:42 +08:00 committed by Qt Cherry-pick Bot
parent a017641c5b
commit 09c6f3207d
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2818,16 +2818,14 @@ QString QSysInfo::productType()
Typical returned values are (note: list not exhaustive):
\list
\li "2016.09" (Amazon Linux AMI 2016.09)
\li "7.1" (Android Nougat)
\li "25" (Fedora 25)
\li "10.1" (iOS 10.1)
\li "10.12" (macOS Sierra)
\li "10.0" (tvOS 10)
\li "16.10" (Ubuntu 16.10)
\li "3.1" (watchOS 3.1)
\li "10" (Windows 10)
\li "Server 2016" (Windows Server 2016)
\li "12" (Android 12)
\li "36" (Fedora 36)
\li "15.5" (iOS 15.5)
\li "12.4" (macOS Monterey)
\li "22.04" (Ubuntu 22.04)
\li "8.6" (watchOS 8.6)
\li "11" (Windows 11)
\li "Server 2022" (Windows Server 2022)
\endlist
On Linux systems, it will try to determine the distribution version and will