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/qglobal.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/qglobal.cpp')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 1ed63aea9b..d42a7a0ea6 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -2293,6 +2293,7 @@ Lollipop Lollipop Marshmallow Nougat +Nougat */ static const char versions_string[] = "\0" @@ -2314,7 +2315,7 @@ Nougat 0, 0, 0, 1, 9, 15, 15, 15, 22, 28, 28, 40, 40, 40, 50, 50, 69, 69, 69, 80, 80, 87, 87, 96, - 108, -1 + 108, 108, -1 }; static const int versions_count = (sizeof versions_indices) / (sizeof versions_indices[0]); |