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

Android: Add Android 14 to QOperatingSystemVersion

Browse Source 
Fixes: QTBUG-116643
Change-Id: I014ada85deda44226e68d230aebc3c3d5a62df00
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Assam Boudjelthia 2023-09-14 11:18:00 +03:00 committed by Rami Potinkara
parent c24572d2a4
commit 29919f3dc9
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -701,6 +701,12 @@ const QOperatingSystemVersionBase QOperatingSystemVersion::Android12L;
*/ */
const QOperatingSystemVersionBase QOperatingSystemVersion::Android13; const QOperatingSystemVersionBase QOperatingSystemVersion::Android13;
/*!
\variable QOperatingSystemVersion::Android14
\brief a version corresponding to Android 14 (version 14.0, API level 34).
\since 6.7
*/
#endif // !QT_BOOTSTRAPPED #endif // !QT_BOOTSTRAPPED
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM

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

@ -119,6 +119,7 @@ class QOperatingSystemVersion : public QOperatingSystemVersionBase
// ### Qt7: Regroup with the rest below // ### Qt7: Regroup with the rest below
static constexpr QOperatingSystemVersionBase MacOSSonoma { QOperatingSystemVersionBase::MacOS, 14, 0 }; static constexpr QOperatingSystemVersionBase MacOSSonoma { QOperatingSystemVersionBase::MacOS, 14, 0 };
static constexpr QOperatingSystemVersionBase Android14 { QOperatingSystemVersionBase::Android, 14, 0 };
#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) && !defined(QT_BOOTSTRAPPED) && !defined(Q_QDOC) #if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) && !defined(QT_BOOTSTRAPPED) && !defined(Q_QDOC)
}; };