diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-10-27 11:06:01 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-10-28 03:30:11 +0000 |
| commit | 7883329a6db1a27ee0926fe9e11b23056b82091e (patch) | |
| tree | d6f1809e11ffb815f7674e3ddeee4a11d2c0a0c9 /src/corelib/global/qoperatingsystemversion.h | |
| parent | 9428bca72e472e5a331976e49a68b5484ccc5f88 (diff) | |
QOperatingSystemVersion: add separate variables per Android API level
It's nonsensical to have a variable like AndroidJellyBean which is
documented as Android versions 4.1 through 4.3 but is actually codified
as 4.1. Add separate variables for Android "maintenance releases" which
incremented both the version number and API level. "MRn" where n is an
integer is the same naming convention the Android APIs use.
The only exception to this rule is Android 4.4W (API level 20) which was
KitKat for watches. 4.4W is not a representible or comparable version
number, so for now, AndroidKitKat will identify both Android 4.4 and
4.4W (API levels 19 and 20). As Qt does not yet support Android Wear,
this is not expected to be a problem in practice.
Change-Id: I28473bad86bbe747db292bd0a9a164eeeba56a32
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/qoperatingsystemversion.h')
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/global/qoperatingsystemversion.h b/src/corelib/global/qoperatingsystemversion.h index 33c3d33bcc..3a50bd09c8 100644 --- a/src/corelib/global/qoperatingsystemversion.h +++ b/src/corelib/global/qoperatingsystemversion.h @@ -71,8 +71,11 @@ public: static const QOperatingSystemVersion MacOSSierra; static const QOperatingSystemVersion AndroidJellyBean; + static const QOperatingSystemVersion AndroidJellyBean_MR1; + static const QOperatingSystemVersion AndroidJellyBean_MR2; static const QOperatingSystemVersion AndroidKitKat; static const QOperatingSystemVersion AndroidLollipop; + static const QOperatingSystemVersion AndroidLollipop_MR1; static const QOperatingSystemVersion AndroidMarshmallow; static const QOperatingSystemVersion AndroidNougat; |