1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove special case for Android in QSysInfo::productVersion

Browse Source 
Incidentally, this means that the function will no longer include the
patch version number on Android, but this is more consistent with other
platforms like Apple and Windows anyways.

Change-Id: I9996317e73e491b3a139a511efe1384c57b73e0a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Jake Petroules 2016-09-09 10:01:58 -07:00
parent 55ac42dd13
commit 42ac179631
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/global/qglobal.cpp
View File

@ -2669,7 +2669,7 @@ QString QSysInfo::productType()
*/ */
QString QSysInfo::productVersion() QString QSysInfo::productVersion()
{ {
#if defined(Q_OS_DARWIN) #if defined(Q_OS_ANDROID) || defined(Q_OS_DARWIN)
const auto version = QOperatingSystemVersion::current(); const auto version = QOperatingSystemVersion::current();
return QString::number(version.majorVersion()) + QLatin1Char('.') + QString::number(version.minorVersion()); return QString::number(version.majorVersion()) + QLatin1Char('.') + QString::number(version.minorVersion());
#elif defined(Q_OS_WIN) #elif defined(Q_OS_WIN)
@ -2680,9 +2680,6 @@ QString QSysInfo::productVersion()
} }
// fall through // fall through
// Android should not fall through to the Unix code
#elif defined(Q_OS_ANDROID)
return QJNIObjectPrivate::getStaticObjectField("android/os/Build$VERSION", "RELEASE", "Ljava/lang/String;").toString();
#elif defined(USE_ETC_OS_RELEASE) // Q_OS_UNIX #elif defined(USE_ETC_OS_RELEASE) // Q_OS_UNIX
QUnixOSVersion unixOsVersion; QUnixOSVersion unixOsVersion;
findUnixOsVersion(unixOsVersion); findUnixOsVersion(unixOsVersion);