From 3a4a8398ab3da142638c6f40379b1a593e4209e4 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 5 May 2021 19:39:13 +0300 Subject: [PATCH] Add sdkVersion() to QNativeInterface::QAndroidApplication MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The androidSdkVersion() is probably the most used call from QtAndroidPrivate, so instead of waiting long time for a cross platform api that could offer this functionality, it's better to have it now under the NativeInterface. Task-number: QTBUG-90497 Change-Id: I008d4c77d347d36e0a7e8ca4d6f33f993b02511b Reviewed-by: Tor Arne Vestbø --- src/corelib/kernel/qcoreapplication_platform.h | 1 + .../platform/android/qandroidnativeinterface.cpp | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/src/corelib/kernel/qcoreapplication_platform.h b/src/corelib/kernel/qcoreapplication_platform.h index 8dc11991354..15d9abc3fc3 100644 --- a/src/corelib/kernel/qcoreapplication_platform.h +++ b/src/corelib/kernel/qcoreapplication_platform.h @@ -57,6 +57,7 @@ struct Q_CORE_EXPORT QAndroidApplication QT_DECLARE_NATIVE_INTERFACE(QAndroidApplication) static jobject context(); static bool isActivityContext(); + static int sdkVersion(); }; #endif } diff --git a/src/corelib/platform/android/qandroidnativeinterface.cpp b/src/corelib/platform/android/qandroidnativeinterface.cpp index 74d21c5d4cc..6096d21181a 100644 --- a/src/corelib/platform/android/qandroidnativeinterface.cpp +++ b/src/corelib/platform/android/qandroidnativeinterface.cpp @@ -82,4 +82,15 @@ bool QNativeInterface::QAndroidApplication::isActivityContext() return QtAndroidPrivate::activity(); } +/*! + \fn int QNativeInterface::QAndroidApplication::sdkVersion() + + Returns the Android SDK version. This is also known as the API level. + + \since 6.2 +*/ +int QNativeInterface::QAndroidApplication::sdkVersion() +{ + return QtAndroidPrivate::androidSdkVersion(); +} QT_END_NAMESPACE