diff options
| -rw-r--r-- | .qmake.conf | 4 | ||||
| -rw-r--r-- | src/androidextras/android/qandroidfunctions.cpp | 23 | ||||
| -rw-r--r-- | src/androidextras/android/qandroidfunctions.h | 1 |
3 files changed, 23 insertions, 5 deletions
diff --git a/.qmake.conf b/.qmake.conf index a2a0d41..aae5d51 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,5 @@ load(qt_build_config) -MODULE_VERSION = 5.7.1 +DEFINES += QT_NO_FOREACH + +MODULE_VERSION = 5.8.0 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,9 +71,9 @@ 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() { @@ -81,6 +81,21 @@ QAndroidJniObject QtAndroid::androidService() } /*! + \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, |