AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update QOperatingSystemVersion version names for Android

Browse Source 
Change-Id: I88c7713cd75f84d11b303e0dad2093c7d5568bc4
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
This commit is contained in:
Assam Boudjelthia 2021-01-19 10:53:05 +02:00
parent 9b2df27bb3
commit eb6e65e64a
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,6 +200,10 @@ QOperatingSystemVersion QOperatingSystemVersion::current()
{ 7, 0 }, // API level 24
{ 7, 1 }, // API level 25
{ 8, 0 }, // API level 26
{ 8, 1 }, // API level 27
{ 9, 0 }, // API level 28
{ 10, 0 }, // API level 29
{ 11, 0 }, // API level 30
};
// This will give us at least the first 2 version components
@ -563,6 +567,38 @@ const QOperatingSystemVersion QOperatingSystemVersion::AndroidNougat_MR1 =
const QOperatingSystemVersion QOperatingSystemVersion::AndroidOreo =
QOperatingSystemVersion(QOperatingSystemVersion::Android, 8, 0);
/*!
\variable QOperatingSystemVersion::AndroidOreo_MR1
\brief a version corresponding to Android Oreo_MR1 (version 8.1, API level 27).
\since 6.1
*/
const QOperatingSystemVersion QOperatingSystemVersion::AndroidOreo_MR1 =
QOperatingSystemVersion(QOperatingSystemVersion::Android, 8, 1);
/*!
\variable QOperatingSystemVersion::AndroidPie
\brief a version corresponding to Android Pie (version 9.0, API level 28).
\since 6.1
*/
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).
\since 6.1
*/
const QOperatingSystemVersion QOperatingSystemVersion::AndroidQ =
QOperatingSystemVersion(QOperatingSystemVersion::Android, 10, 0);
/*!
\variable QOperatingSystemVersion::AndroidR
\brief a version corresponding to Android R (version 11.0, API level 30).
\since 6.1
*/
const QOperatingSystemVersion QOperatingSystemVersion::AndroidR =
QOperatingSystemVersion(QOperatingSystemVersion::Android, 11, 0);
#ifndef QT_NO_DEBUG_STREAM
QDebug operator<<(QDebug debug, const QOperatingSystemVersion &ov)
{

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

@ -84,6 +84,10 @@ public:
static const QOperatingSystemVersion AndroidNougat;
static const QOperatingSystemVersion AndroidNougat_MR1;
static const QOperatingSystemVersion AndroidOreo;
static const QOperatingSystemVersion AndroidOreo_MR1;
static const QOperatingSystemVersion AndroidPie;
static const QOperatingSystemVersion AndroidQ;
static const QOperatingSystemVersion AndroidR;
constexpr QOperatingSystemVersion(OSType osType,
int vmajor, int vminor = -1, int vmicro = -1)