diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-10-27 11:06:51 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-10-28 03:30:24 +0000 |
| commit | 8a49b314e3566615cbf000b7914efda6e268b6f8 (patch) | |
| tree | e8d3c1aa4ac92d543ca3cec1949b9829dfc46c6c /src/corelib/global/qoperatingsystemversion.cpp | |
| parent | 7883329a6db1a27ee0926fe9e11b23056b82091e (diff) | |
QOperatingSystemVersion: add Android Nougat MR1 (v7.1, API level 25)
Change-Id: I1c391fc06b6fc5bb97d402ab3c3bc40520d26269
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/qoperatingsystemversion.cpp')
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp index f4fd1b52dc..75d3f99fee 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -143,6 +143,7 @@ QOperatingSystemVersion QOperatingSystemVersion::current() { 5, 1 }, // API level 22 { 6, 0 }, // API level 23 { 7, 0 }, // API level 24 + { 7, 1 }, // API level 25 }; // This will give us at least the first 2 version components @@ -412,4 +413,11 @@ const QOperatingSystemVersion QOperatingSystemVersion::AndroidMarshmallow = QOpe */ const QOperatingSystemVersion QOperatingSystemVersion::AndroidNougat = QOperatingSystemVersion(QOperatingSystemVersion::Android, 7, 0); +/*! + \variable QOperatingSystemVersion::AndroidNougat_MR1 + \brief a version corresponding to Android Nougat, maintenance release 1 (version 7.0, API level 25). + \since 5.9 + */ +const QOperatingSystemVersion QOperatingSystemVersion::AndroidNougat_MR1 = QOperatingSystemVersion(QOperatingSystemVersion::Android, 7, 1); + QT_END_NAMESPACE |