From 29919f3dc9600f3f1b63ec551c3cd080967843e6 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Thu, 14 Sep 2023 11:18:00 +0300 Subject: Android: Add Android 14 to QOperatingSystemVersion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: QTBUG-116643 Change-Id: I014ada85deda44226e68d230aebc3c3d5a62df00 Reviewed-by: Mårten Nordheim --- src/corelib/global/qoperatingsystemversion.cpp | 6 ++++++ src/corelib/global/qoperatingsystemversion.h | 1 + 2 files changed, 7 insertions(+) diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp index 843a5dbfad..257835e0bc 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -701,6 +701,12 @@ const QOperatingSystemVersionBase QOperatingSystemVersion::Android12L; */ 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 #ifndef QT_NO_DEBUG_STREAM diff --git a/src/corelib/global/qoperatingsystemversion.h b/src/corelib/global/qoperatingsystemversion.h index bb46f0dbc9..a360231208 100644 --- a/src/corelib/global/qoperatingsystemversion.h +++ b/src/corelib/global/qoperatingsystemversion.h @@ -119,6 +119,7 @@ class QOperatingSystemVersion : public QOperatingSystemVersionBase // ### Qt7: Regroup with the rest below 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) }; -- cgit v1.2.3