From 8a49b314e3566615cbf000b7914efda6e268b6f8 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Thu, 27 Oct 2016 11:06:51 -0700 Subject: [PATCH] QOperatingSystemVersion: add Android Nougat MR1 (v7.1, API level 25) Change-Id: I1c391fc06b6fc5bb97d402ab3c3bc40520d26269 Reviewed-by: Thiago Macieira --- src/corelib/global/qglobal.cpp | 3 ++- src/corelib/global/qoperatingsystemversion.cpp | 8 ++++++++ src/corelib/global/qoperatingsystemversion.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) 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 @@ -2292,6 +2292,7 @@ KitKat Lollipop Lollipop Marshmallow +Nougat Nougat */ static const char versions_string[] = @@ -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]); 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 diff --git a/src/corelib/global/qoperatingsystemversion.h b/src/corelib/global/qoperatingsystemversion.h index 3a50bd09c8..ef999c6ae4 100644 --- a/src/corelib/global/qoperatingsystemversion.h +++ b/src/corelib/global/qoperatingsystemversion.h @@ -78,6 +78,7 @@ public: static const QOperatingSystemVersion AndroidLollipop_MR1; static const QOperatingSystemVersion AndroidMarshmallow; static const QOperatingSystemVersion AndroidNougat; + static const QOperatingSystemVersion AndroidNougat_MR1; QOperatingSystemVersion(const QOperatingSystemVersion &other) = default; Q_DECL_CONSTEXPR QOperatingSystemVersion(OSType osType, int vmajor, int vminor = -1, int vmicro = -1)