diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-08-16 16:03:37 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-08-22 05:45:17 +0000 |
| commit | 0f4cce2630efaaa27f35b630119f2511fd3002bb (patch) | |
| tree | 575a6d706afe153005ce408dd783a01dfb07b1c2 /src/corelib/global | |
| parent | 2ea3c0d5f641ebcee20e76a3874e9c6a27459259 (diff) | |
QOperatingSystemVersion: add Android Oreo (v8.0, API level 26)
[ChangeLog][Binary Compatibility Note] The variable
QOperatingSystemVersion::AndroidOreo was added in this release.
Code that uses this variable will not run under Qt 5.9.1.
If backwards compatibility is desired, use instead
QOperatingSystemVersion(QOperatingSystemVersion::Android, 8)
Change-Id: I1da5a5577bf6b719e543a1ded1f9b912a83665c3
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion.cpp | 9 | ||||
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion.h | 1 |
3 files changed, 13 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index a9664e7564..b5cc88534e 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -2339,6 +2339,7 @@ Lollipop Marshmallow Nougat Nougat +Oreo */ static const char versions_string[] = "\0" @@ -2354,13 +2355,14 @@ Nougat "Lollipop\0" "Marshmallow\0" "Nougat\0" + "Oreo\0" "\0"; static const int versions_indices[] = { 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, 108, -1 + 108, 108, 115, -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 83ba6e69ee..594dc6bc17 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -204,6 +204,7 @@ QOperatingSystemVersion QOperatingSystemVersion::current() { 6, 0 }, // API level 23 { 7, 0 }, // API level 24 { 7, 1 }, // API level 25 + { 8, 0 }, // API level 26 }; // This will give us at least the first 2 version components @@ -501,4 +502,12 @@ const QOperatingSystemVersion QOperatingSystemVersion::AndroidNougat = const QOperatingSystemVersion QOperatingSystemVersion::AndroidNougat_MR1 = QOperatingSystemVersion(QOperatingSystemVersion::Android, 7, 1); +/*! + \variable QOperatingSystemVersion::AndroidOreo + \brief a version corresponding to Android Oreo (version 8.0, API level 26). + \since 5.9.2 + */ +const QOperatingSystemVersion QOperatingSystemVersion::AndroidOreo = + QOperatingSystemVersion(QOperatingSystemVersion::Android, 8, 0); + QT_END_NAMESPACE diff --git a/src/corelib/global/qoperatingsystemversion.h b/src/corelib/global/qoperatingsystemversion.h index 2e319e66d5..1f3ff8e1ab 100644 --- a/src/corelib/global/qoperatingsystemversion.h +++ b/src/corelib/global/qoperatingsystemversion.h @@ -80,6 +80,7 @@ public: static const QOperatingSystemVersion AndroidMarshmallow; static const QOperatingSystemVersion AndroidNougat; static const QOperatingSystemVersion AndroidNougat_MR1; + static const QOperatingSystemVersion AndroidOreo; Q_DECL_CONSTEXPR QOperatingSystemVersion(OSType osType, int vmajor, int vminor = -1, int vmicro = -1) |