diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-03-22 23:28:23 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-09 19:39:57 +0200 |
| commit | f1e97f421a0128a5e7395acd627b14930807545f (patch) | |
| tree | 9e914b8ea24e66f04996893135ab5dd4faa23149 /src/corelib/global | |
| parent | 7a6883081ca7ce9978f4c1779eef718ec9a35d0a (diff) | |
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>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
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()) |