Merge remote-tracking branch 'origin/5.7' into dev

Change-Id: Ifffe7c27e728535f04610b63e1d1f3ee8bf070d5

10 files changed, 62 insertions, 9 deletions

diff --git a/dist/changes-5.6.0 b/dist/changes-5.6.0
new file mode 100644
index 0000000..f9e7e75
--- /dev/null
+++ b/dist/changes-5.6.0
@@ -0,0 +1,22 @@
+Qt 5.6 introduces many new features and improvements as well as bugfixes
+over the 5.5.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+   http://doc.qt.io/qt-5.6
+
+The Qt version 5.6 series is binary compatible with the 5.5.x series.
+Applications compiled for 5.5 will continue to run with 5.6.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                                 General                                  *
+****************************************************************************
+ - This release contains only minor improvements.
+
diff --git a/examples/androidextras/notification/android-sources/res/drawable/icon.png b/examples/androidextras/notification/android-sources/res/drawable/icon.png
index e870213..035c600 100644
--- a/examples/androidextras/notification/android-sources/res/drawable/icon.png
+++ b/examples/androidextras/notification/android-sources/res/drawable/icon.png
diff --git a/examples/androidextras/notification/images/happy.png b/examples/androidextras/notification/images/happy.png
index d1c1460..fd31f8d 100644
--- a/examples/androidextras/notification/images/happy.png
+++ b/examples/androidextras/notification/images/happy.png
diff --git a/examples/androidextras/notification/images/sad.png b/examples/androidextras/notification/images/sad.png
index 00026bd..74e8f8f 100644
--- a/examples/androidextras/notification/images/sad.png
+++ b/examples/androidextras/notification/images/sad.png
diff --git a/src/androidextras/android/qandroidfunctions.cpp b/src/androidextras/android/qandroidfunctions.cpp
index 5c99642..5b7f12f 100644
--- a/src/androidextras/android/qandroidfunctions.cpp
+++ b/src/androidextras/android/qandroidfunctions.cpp
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
     Returns a handle to this applications main Activity
 
-    \sa QAndroidJniObject
+    \sa QAndroidJniObject, androidService()
 */
 QAndroidJniObject QtAndroid::androidActivity()
 {
@@ -68,6 +68,19 @@ QAndroidJniObject QtAndroid::androidActivity()
 }
 
 /*!
+    \since 5.7
+    \fn QAndroidJniObject QtAndroid::androidService()
+
+    Returns a handle to this applications main Service
+
+    \sa QAndroidJniObject, androidActivity()
+*/
+QAndroidJniObject QtAndroid::androidService()
+{
+    return QtAndroidPrivate::service();
+}
+
+/*!
     \since 5.3
     \fn int QtAndroid::androidSdkVersion()
 
@@ -198,4 +211,16 @@ void QtAndroid::runOnAndroidThreadSync(const QtAndroid::Runnable &runnable, int
     QtAndroidPrivate::runOnAndroidThreadSync(runnable, QJNIEnvironmentPrivate(), timeoutMs);
 }
 
+
+/*!
+  \since 5.7
+  \fn void QtAndroid::hideSplashScreen()
+
+  Hides the splash screen.
+*/
+void QtAndroid::hideSplashScreen()
+{
+    QtAndroidPrivate::hideSplashScreen(QJNIEnvironmentPrivate());
+}
+
 QT_END_NAMESPACE
diff --git a/src/androidextras/android/qandroidfunctions.h b/src/androidextras/android/qandroidfunctions.h
index 8fde117..d86fe92 100644
--- a/src/androidextras/android/qandroidfunctions.h
+++ b/src/androidextras/android/qandroidfunctions.h
@@ -55,18 +55,21 @@ class QAndroidActivityResultReceiver;
 namespace QtAndroid
 {
     Q_ANDROIDEXTRAS_EXPORT QAndroidJniObject androidActivity();
+    Q_ANDROIDEXTRAS_EXPORT QAndroidJniObject androidService();
     Q_ANDROIDEXTRAS_EXPORT int androidSdkVersion();
 
     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);
     Q_ANDROIDEXTRAS_EXPORT void runOnAndroidThreadSync(const Runnable &runnable, int timeoutMs = INT_MAX);
+
+    Q_ANDROIDEXTRAS_EXPORT void hideSplashScreen();
 }
 
 QT_END_NAMESPACE
diff --git a/src/androidextras/androidextras.pro b/src/androidextras/androidextras.pro
index 78bd8eb..7b5d218 100644
--- a/src/androidextras/androidextras.pro
+++ b/src/androidextras/androidextras.pro
@@ -5,6 +5,7 @@ QMAKE_DOCS = \
 QT -= gui
 QT += core-private
 
-load(qt_module)
 include(jni/jni.pri)
 include(android/android.pri)
+
+load(qt_module)
diff --git a/src/androidextras/doc/images/notification.png b/src/androidextras/doc/images/notification.png
index 4ba7818..89784ea 100644
--- a/src/androidextras/doc/images/notification.png
+++ b/src/androidextras/doc/images/notification.png
diff --git a/src/androidextras/jni/qandroidjniobject.cpp b/src/androidextras/jni/qandroidjniobject.cpp
index bca9487..9624489 100644
--- a/src/androidextras/jni/qandroidjniobject.cpp
+++ b/src/androidextras/jni/qandroidjniobject.cpp
@@ -318,10 +318,12 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn QAndroidJniObject::~QAndroidJniObject()
-
     Destroys the QAndroidJniObject and releases any references held by the QAndroidJniObject.
 */
+QAndroidJniObject::~QAndroidJniObject()
+{
+    // must be empty until ### Qt 6
+}
 
 /*!
     \fn T QAndroidJniObject::callMethod(const char *methodName, const char *signature, ...) const
diff --git a/src/androidextras/jni/qandroidjniobject.h b/src/androidextras/jni/qandroidjniobject.h
index 12d3b11..94bd901 100644
--- a/src/androidextras/jni/qandroidjniobject.h
+++ b/src/androidextras/jni/qandroidjniobject.h
@@ -54,11 +54,11 @@ class Q_ANDROIDEXTRAS_EXPORT QAndroidJniObject
 public:
     QAndroidJniObject();
     explicit QAndroidJniObject(const char *className);
-    QAndroidJniObject(const char *className, const char *sig, ...);
+    explicit QAndroidJniObject(const char *className, const char *sig, ...);
     explicit QAndroidJniObject(jclass clazz);
-    QAndroidJniObject(jclass clazz, const char *sig, ...);
+    explicit QAndroidJniObject(jclass clazz, const char *sig, ...);
     QAndroidJniObject(jobject obj);
-    ~QAndroidJniObject() { }
+    ~QAndroidJniObject();
 
     template <typename T>
     inline T object() const { return static_cast<T>(javaObject()); }