Rework of QSysInfo OS and kernel version functions

This patch splits the OS product from the kernel name and versions.
Previously, it was a little confusing.

Thus, osType is split in two: kernelType() always returns the kernel
type, which includes "linux" for Android, "darwin" for iOS and OS X,
"qnx" for BlackBerry, and "windows" for all the Windows OSes. The Linux
distribution name and the visible product names are found in
productType(), with the respective versions in productVersion().

For an update system, applications probably want to send all four
tokens:
 - for Android, BlackBerry, iOS, OS X and Windows, the relevant
   information is productType and productVersion
 - for Linux distributions, in addition to productType and
   productVersion, the kernelType ("linux") is useful as a fallback and
   it's important for Debian/kFreeBSD and Debian/GNU
 - for other Unix systems, the relevant information is kernelType and
   kernelVersion

Change-Id: I66c36d5a4ddfad47babfc6744d752273705e7076
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/src/corelib/global/qsysinfo.h b/src/corelib/global/qsysinfo.h
index e9a30b5bc3..3a443938f9 100644
--- a/src/corelib/global/qsysinfo.h
+++ b/src/corelib/global/qsysinfo.h
@@ -169,10 +169,12 @@ public:
     static QString buildCpuArchitecture();
     static QString currentCpuArchitecture();
     static QString buildAbi();
-    static QString osType();
-    static QString osKernelVersion();
-    static QString osVersion();
-    static QString prettyOsName();
+
+    static QString kernelType();
+    static QString kernelVersion();
+    static QString productType();
+    static QString productVersion();
+    static QString prettyProductName();
 };
 
 QT_END_NAMESPACE