diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2021-12-23 08:59:24 -0300 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-12-23 15:26:35 +0000 |
| commit | 60db7a5dc1a52f025e6ae6a78ee36803a62cfcb6 (patch) | |
| tree | c2722b15c2935198a2c003e10f51593fa7a4fcf5 /src | |
| parent | cd2690dcbfc79d4bd7146c410a5edbdc477f92b5 (diff) | |
Doc: QSysInfo::productType: remove the "will be" note about Qt 6
Fixes: QTBUG-99413
Pick-to: 6.2 6.3
Change-Id: Ib42b3adc93bf4d43bd55fffd16c360797871011b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 7cb472a6b5..befc007868 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -2772,10 +2772,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 |