From 57aacdd654a7dec2f8ff412f4f3705d0bd50a0a9 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Sat, 9 Nov 2019 00:22:54 +0100 Subject: Doc: Fix documentation warnings Remove references of resultReceiver parameter from a new QtAndroid::startActivity() overload, as it has no such parameter. Add a few dummy typedefs specific to documentation builds, to avoid the Clang-parser from tripping over undefined types on non-Android platforms. Fixes: QTBUG-79813 Change-Id: I6972ae7d5b8d4ca7f338af8958ccf3cf43dce71c Reviewed-by: Paul Wicking --- src/androidextras/android/qandroidfunctions.cpp | 7 ++----- 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 -- cgit v1.2.3