diff options
-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) |