From c944c05ca4e4d42b6b11721ddc763f1525d6fcfa Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Wed, 3 Aug 2016 09:41:43 +0200 Subject: Add QtAndroid::androidContext() [ChangeLog][QtAndroidExtras][QtAndroid] Added QtAndroid::androidContext() Task-number: QTBUG-55102 Change-Id: I95122c8939e227acffb13ea9ba1a338a9d05595a Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/androidextras/android/qandroidfunctions.cpp | 23 +++++++++++++++++++---- src/androidextras/android/qandroidfunctions.h | 1 + 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/androidextras/android/qandroidfunctions.cpp b/src/androidextras/android/qandroidfunctions.cpp index 5b7f12f..510788b 100644 --- a/src/androidextras/android/qandroidfunctions.cpp +++ b/src/androidextras/android/qandroidfunctions.cpp @@ -58,9 +58,9 @@ QT_BEGIN_NAMESPACE \since 5.3 \fn QAndroidJniObject QtAndroid::androidActivity() - Returns a handle to this applications main Activity + Returns a handle to this application's main Activity - \sa QAndroidJniObject, androidService() + \sa QAndroidJniObject, androidService(), androidContext() */ QAndroidJniObject QtAndroid::androidActivity() { @@ -71,15 +71,30 @@ QAndroidJniObject QtAndroid::androidActivity() \since 5.7 \fn QAndroidJniObject QtAndroid::androidService() - Returns a handle to this applications main Service + Returns a handle to this application's main Service - \sa QAndroidJniObject, androidActivity() + \sa QAndroidJniObject, androidActivity(), androidContext() */ QAndroidJniObject QtAndroid::androidService() { return QtAndroidPrivate::service(); } +/*! + \since 5.8 + \fn QAndroidJniObject QtAndroid::androidContext() + + Returns a handle to this application's main Context. Depending on the nature of + the application the Context object is either the main Service or Activity + object. + + \sa QAndroidJniObject, androidActivity(), androidService() +*/ +QAndroidJniObject QtAndroid::androidContext() +{ + return QtAndroidPrivate::context(); +} + /*! \since 5.3 \fn int QtAndroid::androidSdkVersion() diff --git a/src/androidextras/android/qandroidfunctions.h b/src/androidextras/android/qandroidfunctions.h index d86fe92..220d75d 100644 --- a/src/androidextras/android/qandroidfunctions.h +++ b/src/androidextras/android/qandroidfunctions.h @@ -56,6 +56,7 @@ namespace QtAndroid { Q_ANDROIDEXTRAS_EXPORT QAndroidJniObject androidActivity(); Q_ANDROIDEXTRAS_EXPORT QAndroidJniObject androidService(); + Q_ANDROIDEXTRAS_EXPORT QAndroidJniObject androidContext(); Q_ANDROIDEXTRAS_EXPORT int androidSdkVersion(); Q_ANDROIDEXTRAS_EXPORT void startIntentSender(const QAndroidJniObject &intentSender, -- cgit v1.2.3