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

Change-Id: I3d3f2f84808ca29a056783873dd78094a53c2875

2 files changed, 7 insertions, 5 deletions

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()); }