diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-17 03:00:18 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-17 03:00:18 +0200 |
commit | 254ee1c61aebf43ffedf389d7872d79a3be0583d (patch) | |
tree | 8869725c1337e4ecf6c64343e05543fb973bce3c | |
parent | a8c597d231e5523a71cd3734c9a29d234c529968 (diff) | |
parent | ab234ad62ac530b9e12482f0d98c189bee4afee3 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ib5147f11d0577e81423abe38c484e92f6dedd594
-rw-r--r-- | src/androidextras/android/qandroidfunctions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/androidextras/android/qandroidfunctions.cpp b/src/androidextras/android/qandroidfunctions.cpp index dc790b1..a5ed23d 100644 --- a/src/androidextras/android/qandroidfunctions.cpp +++ b/src/androidextras/android/qandroidfunctions.cpp @@ -211,7 +211,7 @@ void QtAndroid::startIntentSender(const QAndroidJniObject &intentSender, 0); // extraFlags } else { activity.callMethod<void>("startIntentSender", - "(Landroid/content/Intent;Landroid/content/Intent;III)V", + "(Landroid/content/IntentSender;Landroid/content/Intent;III)V", intentSender.object<jobject>(), 0, // fillInIntent 0, // flagsMask |