1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Documentation: Update API documentation of QAndroidPrivate

Browse Source 
- 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 <assam.boudjelthia@qt.io>
(cherry picked from commit 91f70771a86a5110eff96ac40bba0b5770154708)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Shyamnath Premnadh 2024-08-12 13:41:15 +02:00 committed by Qt Cherry-pick Bot
parent 2d6788d6eb
commit 887076220a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/corelib/platform/android/qandroidextras.cpp
View File

@ -897,8 +897,9 @@ QJniObject QAndroidIntent::handle() const
Starts the activity given by \a intent and provides the result asynchronously through the Starts the activity given by \a intent and provides the result asynchronously through the
\a resultReceiver if this is non-null. \a resultReceiver if this is non-null.
If \a resultReceiver is null, then the \c startActivity() method in the \c androidActivity() If \a resultReceiver is null, then the \c startActivity() method of
will be called. Otherwise \c startActivityForResult() will be called. 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 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 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 Starts the activity given by \a intent and provides the result asynchronously through the
\a resultReceiver if this is non-null. \a resultReceiver if this is non-null.
If \a resultReceiver is null, then the \c startActivity() method in the \c androidActivity() If \a resultReceiver is null, then the \c startActivity() method of
will be called. Otherwise \c startActivityForResult() will be called. 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 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 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 Starts the activity given by \a intentSender and provides the result asynchronously through the
\a resultReceiver if this is non-null. \a resultReceiver if this is non-null.
If \a resultReceiver is null, then the \c startIntentSender() method in the \c androidActivity() If \a resultReceiver is null, then the \c startIntentSender() method of
will be called. Otherwise \c startIntentSenderForResult() will be called. 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 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 returned along with the result, making it possible to use the same receiver for more than