diff options
author | Jake Petroules <jake.petroules@qt.io> | 2016-06-15 16:23:52 -0700 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-17 16:43:04 +0000 |
commit | 2fa4a48ff66e2d6cce36a24d768bf2f3bad2983d (patch) | |
tree | 58bde5bcf4483151282a3cae2495fa5640890688 /src/corelib/global | |
parent | 34c24ceb1ffce964c9f139d84b6b271bd2e45c33 (diff) |
Fix documentation of some QSysInfo functions.
Qt 5.8 no longer supports Windows CE, or versions of Windows where the
marketing version is not an orderable version number.
Change-Id: I8fab7d9b0d466f891e872b6c3fdf9d98ffe6ebc1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global')
-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 3eaec11008..ff845ad2f6 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -2561,7 +2561,7 @@ QString QSysInfo::kernelType() \since 5.4 Returns the release version of the operating system kernel. On Windows, it - returns the version of the NT or CE kernel. On Unix systems, including + returns the version of the NT kernel. On Unix systems, including Android and OS X, it returns the same as the \c{uname -r} command would return. @@ -2667,9 +2667,8 @@ QString QSysInfo::productType() In all other Unix-type systems, this function always returns "unknown". - \note The version string returned from this function is only guaranteed to - be orderable on Android, OS X and iOS. On Windows, some Windows - versions are text ("XP" and "Vista", for example). On Linux, the version of + \note The version string returned from this function is not guaranteed to + be orderable. On Linux, the version of the distribution may jump unexpectedly, please refer to the distribution's documentation for versioning practices. |