aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@digia.com>2014-02-17 12:53:57 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-20 15:50:49 +0100
commit7449ba7d04e0466eeb09001ffb7e4d38170a90cd (patch)
tree16c7993656876a8188d9052ef93e7e97845529b3 /src
parent4a81d3bbe8ff3ae8b80982299b81031c7966cc16 (diff)
Add QAndroidActivityResultReceiver to the documentation.
QAndroidActivityResultReceiver was missing the \inmodule command and was therefore not shown in the class list. Change-Id: Ide0670e7ff377420e9690b6ff5421bf5fe0d96e3 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/androidextras/android/qandroidactivityresultreceiver.cpp1
-rw-r--r--src/androidextras/android/qandroidfunctions.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/androidextras/android/qandroidactivityresultreceiver.cpp b/src/androidextras/android/qandroidactivityresultreceiver.cpp
index 819d322..a466eed 100644
--- a/src/androidextras/android/qandroidactivityresultreceiver.cpp
+++ b/src/androidextras/android/qandroidactivityresultreceiver.cpp
@@ -85,6 +85,7 @@ bool QAndroidActivityResultReceiverPrivate::handleActivityResult(jint requestCod
/*!
\class QAndroidActivityResultReceiver
+ \inmodule QtAndroidExtras
\since 5.3
\brief Interface used for callbacks from onActivityResult() in the main Android activity.
diff --git a/src/androidextras/android/qandroidfunctions.cpp b/src/androidextras/android/qandroidfunctions.cpp
index 582ee4c..2e1e4bb 100644
--- a/src/androidextras/android/qandroidfunctions.cpp
+++ b/src/androidextras/android/qandroidfunctions.cpp
@@ -92,7 +92,6 @@ int QtAndroid::androidSdkVersion()
returned along with the result, making it possible to use the same receiver for more than
one intent.
- The \a optionsBundle provides additional options for the activity.
*/
void QtAndroid::startActivity(const QAndroidJniObject &intent,
int receiverRequestCode,
@@ -125,7 +124,6 @@ void QtAndroid::startActivity(const QAndroidJniObject &intent,
returned along with the result, making it possible to use the same receiver for more than
one intent.
- The \a optionsBundle provides additional options for the activity.
*/
void QtAndroid::startIntentSender(const QAndroidJniObject &intentSender,
int receiverRequestCode,