1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use official names for Android versions

Browse Source 
Google ditched the dessert names as of Android "Q". "Q" and "R" were
development names, the released versions are called  Android 10 and
Android 11, respectively.

Task-number: QTBUG-90211
Change-Id: I36225067cc802ebd3ebd1289d509759ae1b2d83d
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
(cherry picked from commit 76b3d024e45cc044bde2b6fb4b24849cf96b0012)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2021-03-29 12:16:59 +02:00 committed by Qt Cherry-pick Bot
parent e24f882590
commit ee520939c8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/global/qoperatingsystemversion.cpp
View File

@ -584,19 +584,19 @@ const QOperatingSystemVersion QOperatingSystemVersion::AndroidPie =
QOperatingSystemVersion(QOperatingSystemVersion::Android, 9, 0);
/*!
\variable QOperatingSystemVersion::AndroidQ
\brief a version corresponding to Android Q (version 10.0, API level 29).
\variable QOperatingSystemVersion::Android10
\brief a version corresponding to Android 10 (version 10.0, API level 29).
\since 6.1
*/
const QOperatingSystemVersion QOperatingSystemVersion::AndroidQ =
const QOperatingSystemVersion QOperatingSystemVersion::Android10 =
QOperatingSystemVersion(QOperatingSystemVersion::Android, 10, 0);
/*!
\variable QOperatingSystemVersion::AndroidR
\brief a version corresponding to Android R (version 11.0, API level 30).
\variable QOperatingSystemVersion::Android11
\brief a version corresponding to Android 11 (version 11.0, API level 30).
\since 6.1
*/
const QOperatingSystemVersion QOperatingSystemVersion::AndroidR =
const QOperatingSystemVersion QOperatingSystemVersion::Android11 =
QOperatingSystemVersion(QOperatingSystemVersion::Android, 11, 0);
#ifndef QT_NO_DEBUG_STREAM

4
src/corelib/global/qoperatingsystemversion.h
View File

@ -86,8 +86,8 @@ public:
static const QOperatingSystemVersion AndroidOreo;
static const QOperatingSystemVersion AndroidOreo_MR1;
static const QOperatingSystemVersion AndroidPie;
static const QOperatingSystemVersion AndroidQ;
static const QOperatingSystemVersion AndroidR;
static const QOperatingSystemVersion Android10;
static const QOperatingSystemVersion Android11;
constexpr QOperatingSystemVersion(OSType osType,
int vmajor, int vminor = -1, int vmicro = -1)