diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-24 20:00:23 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-24 20:00:23 +0100 |
| commit | 1a509edeba44bd0a45c95ab2ba52e783d9053547 (patch) | |
| tree | 47723ec2f0d183bfb98f0c643362a2aaa507140f | |
| parent | c683ab86bfb0e32bb3b466b5467378225a5b5a46 (diff) | |
| parent | 7449ba7d04e0466eeb09001ffb7e4d38170a90cd (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I354b2d1300dd3dfb2370acb6369aeb4ff38fcb8e
| -rw-r--r-- | src/androidextras/android/qandroidactivityresultreceiver.cpp | 1 | ||||
| -rw-r--r-- | src/androidextras/android/qandroidfunctions.cpp | 2 |
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, |