diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2017-06-22 21:11:37 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2017-06-28 16:30:34 +0000 |
| commit | e9b44518a6b372b694d8da28f8c21971bff05d3f (patch) | |
| tree | bc365c654388ed3f8bf690d7684bdd6c9831c192 /src/corelib | |
| parent | c2a147c3cb71a6740be9528d416a0dba6a4c9ec8 (diff) | |
QOperatingSystemVersion/Android: compress global data
The values do not need to be 2 x 32-bits. Eight bits suffice for a long time to come.
Should save 189 bytes in text size on Android builds.
Change-Id: I78e31e7caa7a698f41c66d7bbac58a766c6e8834
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp index 244f294312..0813b3b25f 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -175,7 +175,10 @@ QOperatingSystemVersion QOperatingSystemVersion::current() version.m_major = -1; version.m_minor = -1; - static const int versions[][2] = { + static const struct { + uint major : 4; + uint minor : 4; + } versions[] = { { 1, 0 }, // API level 1 { 1, 1 }, // API level 2 { 1, 5 }, // API level 3 @@ -207,8 +210,8 @@ QOperatingSystemVersion QOperatingSystemVersion::current() const size_t versionIdx = size_t(QJNIObjectPrivate::getStaticField<jint>( "android/os/Build$VERSION", "SDK_INT")) - 1; if (versionIdx < sizeof(versions) / sizeof(versions[0])) { - version.m_major = versions[versionIdx][0]; - version.m_minor = versions[versionIdx][1]; + version.m_major = versions[versionIdx].major; + version.m_minor = versions[versionIdx].minor; } // API level 6 was exactly version 2.0.1 |