From 887076220a3df2f615b47414b86c11f56e68543d Mon Sep 17 00:00:00 2001 From: Shyamnath Premnadh Date: Mon, 12 Aug 2024 13:41:15 +0200 Subject: [PATCH] Documentation: Update API documentation of QAndroidPrivate - Some references of androidActivity() were replaced by QNativeInterface::QAndroidApplication::context() Pick-to: 6.7 6.5 6.2 Fixes: QTBUG-127926 Change-Id: Ib2fdb3d13ad72121895c5464d8a21cda33bb28b3 Reviewed-by: Assam Boudjelthia (cherry picked from commit 91f70771a86a5110eff96ac40bba0b5770154708) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/platform/android/qandroidextras.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/corelib/platform/android/qandroidextras.cpp b/src/corelib/platform/android/qandroidextras.cpp index aa0c3fd093b..662ba993c71 100644 --- a/src/corelib/platform/android/qandroidextras.cpp +++ b/src/corelib/platform/android/qandroidextras.cpp @@ -897,8 +897,9 @@ QJniObject QAndroidIntent::handle() const Starts the activity given by \a intent and provides the result asynchronously through the \a resultReceiver if this is non-null. - If \a resultReceiver is null, then the \c startActivity() method in the \c androidActivity() - will be called. Otherwise \c startActivityForResult() will be called. + If \a resultReceiver is null, then the \c startActivity() method of + QNativeInterface::QAndroidApplication::context() will be called. Otherwise + \c startActivityForResult() will be called. 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 @@ -930,8 +931,9 @@ void QtAndroidPrivate::startActivity(const QJniObject &intent, Starts the activity given by \a intent and provides the result asynchronously through the \a resultReceiver if this is non-null. - If \a resultReceiver is null, then the \c startActivity() method in the \c androidActivity() - will be called. Otherwise \c startActivityForResult() will be called. + If \a resultReceiver is null, then the \c startActivity() method of + QNativeInterface::QAndroidApplication::context() will be called. Otherwise + \c startActivityForResult() will be called. 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 @@ -967,8 +969,9 @@ void QtAndroidPrivate::startActivity(const QJniObject &intent, Starts the activity given by \a intentSender and provides the result asynchronously through the \a resultReceiver if this is non-null. - If \a resultReceiver is null, then the \c startIntentSender() method in the \c androidActivity() - will be called. Otherwise \c startIntentSenderForResult() will be called. + If \a resultReceiver is null, then the \c startIntentSender() method of + QNativeInterface::QAndroidApplication::context() will be called. Otherwise + \c startIntentSenderForResult() will be called. 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