From 09c6f3207d5abcee0a599a8ad965b7a1d9ea65f7 Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Fri, 8 Jul 2022 17:41:42 +0800 Subject: [PATCH] QSysInfo: update docs to mention the latest os MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ø (cherry picked from commit 14ce67629bd36f75b2a9a0b3caf5c4c5d59abeac) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/global/qglobal.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index fdca568669f..55334d5a1cd 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -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