diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-31 14:34:38 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-08-31 14:34:38 +0000 |
| commit | 4fa90c1757c15425d5e0df1a4f5dbc7e77c265f8 (patch) | |
| tree | 520582ec732b0d29f0a439ee2a2870b5a5d4be66 /src/corelib/global/qglobal.cpp | |
| parent | 1ff52e478bab33f3aaba5ec185295411a0e6867d (diff) | |
| parent | 112a4af10741409b3d8503cb77852a777b607ce0 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 33d7d58df4..f2f807e1d9 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -2385,6 +2385,7 @@ Lollipop Marshmallow Nougat Nougat +Oreo */ static const char versions_string[] = "\0" @@ -2400,13 +2401,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]); |