From f1e97f421a0128a5e7395acd627b14930807545f Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Sat, 22 Mar 2014 23:28:23 -0700
Subject: Implement QSysInfo::osVersion() for BlackBerry

Change-Id: I4bab6f475ba812bb92f9a185528c54f28392355c
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
---
 src/corelib/global/qglobal.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'src/corelib')

diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index c24254e736..f3354d9579 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -81,6 +81,10 @@
 #include <private/qjni_p.h>
 #endif
 
+#if defined(Q_OS_BLACKBERRY)
+#  include <bps/deviceinfo.h>
+#endif
+
 #ifdef Q_OS_UNIX
 #include <sys/utsname.h>
 #include <private/qcore_unix_p.h>
@@ -2333,8 +2337,12 @@ QString QSysInfo::osVersion()
 #elif defined(Q_OS_ANDROID)
     // TBD
 #elif defined(Q_OS_BLACKBERRY)
-    // TBD
-
+    deviceinfo_details_t *deviceInfo;
+    if (deviceinfo_get_details(&deviceInfo) == BPS_SUCCESS) {
+        QString bbVersion = QString::fromLatin1(deviceinfo_details_get_device_os_version(deviceInfo));
+        deviceinfo_free_details(&deviceInfo);
+        return bbVersion;
+    }
 #elif defined(Q_OS_UNIX)
     QUnixOSVersion unixOsVersion = detectUnixVersion();
     if (!unixOsVersion.versionIdentifier.isEmpty())
@@ -2400,7 +2408,7 @@ QString QSysInfo::prettyOsName()
 #elif defined(Q_OS_ANDROID)
     return QLatin1String("Android ") + osVersion();
 #elif defined(Q_OS_BLACKBERRY)
-    return QStringLiteral("BlackBerry 10");
+    return QLatin1String("BlackBerry ") + osVersion();
 #elif defined(Q_OS_UNIX)
     QUnixOSVersion unixOsVersion = detectUnixVersion();
     if (unixOsVersion.versionText.isEmpty())
-- 
cgit v1.2.3