summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorYuhang Zhao <2546789017@qq.com>2022-07-08 17:41:42 +0800
committerYuhang Zhao <2546789017@qq.com>2022-07-09 23:07:18 +0800
commit14ce67629bd36f75b2a9a0b3caf5c4c5d59abeac (patch)
tree1a78f371ed6b48a88fc76d3e5335816544b7ff96 /src/corelib/global
parent1ea0d399b3787d486d6fc59aaaf498cbf6bd66b2 (diff)
QSysInfo: update docs to mention the latest os
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. Pick-to: 6.4 6.3 6.2 5.15 Change-Id: I40e5286b132b8198bf315a2868f89428e8c2f23a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qglobal.cpp18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 2cbbd8d68d..5972ec9a4e 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -2807,16 +2807,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