diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-16 03:00:50 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-16 03:00:51 +0100 |
| commit | 68840e4bfbb9c51944e29e460fbb9734be835892 (patch) | |
| tree | 3ae5ec91fbba81ed0a0aafa32372fa5d3cb4a530 | |
| parent | 5e4a21f0004955a64dd600f717682a6976a53798 (diff) | |
| parent | 57aacdd654a7dec2f8ff412f4f3705d0bd50a0a9 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ibbbcb3186feb5e67011ac7915ad4633c9689b68f
| -rw-r--r-- | src/androidextras/android/qandroidfunctions.cpp | 7 | ||||
| -rw-r--r-- | src/androidextras/doc/QtAndroidExtras/jni.h | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/androidextras/android/qandroidfunctions.cpp b/src/androidextras/android/qandroidfunctions.cpp index 1d1aa44..8d049fc 100644 --- a/src/androidextras/android/qandroidfunctions.cpp +++ b/src/androidextras/android/qandroidfunctions.cpp @@ -205,11 +205,8 @@ void QtAndroid::startActivity(const QAndroidIntent &intent, /*! \since 5.13 - Starts the activity given by \a intent using \c startActivityForResult() and provides the result by calling callbackFunc. - - The \a receiverRequestCode is a request code unique to the \a resultReceiver, and will be - returned along with the result, making it possible to use the same receiver for more than - one intent. + Starts the activity given by \a intent, using the request code \a receiverRequestCode, + and provides the result by calling \a callbackFunc. */ void QtAndroid::startActivity(const QAndroidJniObject &intent, int receiverRequestCode, diff --git a/src/androidextras/doc/QtAndroidExtras/jni.h b/src/androidextras/doc/QtAndroidExtras/jni.h index 01dbf0e..9013345 100644 --- a/src/androidextras/doc/QtAndroidExtras/jni.h +++ b/src/androidextras/doc/QtAndroidExtras/jni.h @@ -43,7 +43,10 @@ #define JNI_H struct JNIEnv_; +struct JavaVM_; typedef JNIEnv_ JNIEnv; +typedef JavaVM_ JavaVM; typedef int jclass; +typedef char jobject; #endif |