Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1

Change-Id: I3d3f2f84808ca29a056783873dd78094a53c2875

1 files changed, 2 insertions, 2 deletions

diff --git a/src/androidextras/android/qandroidfunctions.h b/src/androidextras/android/qandroidfunctions.h
index 862b55c..d86fe92 100644
--- a/src/androidextras/android/qandroidfunctions.h
+++ b/src/androidextras/android/qandroidfunctions.h
@@ -60,10 +60,10 @@ namespace QtAndroid
 
     Q_ANDROIDEXTRAS_EXPORT void startIntentSender(const QAndroidJniObject &intentSender,
                                                   int receiverRequestCode,
-                                                  QAndroidActivityResultReceiver *resultReceiver = 0);
+                                                  QAndroidActivityResultReceiver *resultReceiver = nullptr);
     Q_ANDROIDEXTRAS_EXPORT void startActivity(const QAndroidJniObject &intent,
                                               int receiverRequestCode,
-                                              QAndroidActivityResultReceiver *resultReceiver = 0);
+                                              QAndroidActivityResultReceiver *resultReceiver = nullptr);
 
     typedef std::function<void()> Runnable;
     Q_ANDROIDEXTRAS_EXPORT void runOnAndroidThread(const Runnable &runnable);