diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-29 12:16:59 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-30 12:19:45 +0000 |
| commit | ee520939c812aa0fede48ae5ba06e87159a93423 (patch) | |
| tree | f81f14627c41b5c2b7ecae1751a40a3f1b4682c9 /src/corelib | |
| parent | e24f8825901d70e96c1a9e8ec634d61737c9ea85 (diff) | |
Use official names for Android versions
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>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion.cpp | 12 | ||||
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp index b6ab4435a7..3603852c82 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -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 diff --git a/src/corelib/global/qoperatingsystemversion.h b/src/corelib/global/qoperatingsystemversion.h index a693342824..c884e0e3e8 100644 --- a/src/corelib/global/qoperatingsystemversion.h +++ b/src/corelib/global/qoperatingsystemversion.h @@ -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) |