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

Change-Id: I64352b6cc066255972874e2f9c28abff35f0d613

3 files changed, 10 insertions, 0 deletions

diff --git a/src/nfc/android/androidjninfc.cpp b/src/nfc/android/androidjninfc.cpp
index 671811c3..4adb6f21 100644
--- a/src/nfc/android/androidjninfc.cpp
+++ b/src/nfc/android/androidjninfc.cpp
@@ -96,6 +96,11 @@ QT_END_ANDROIDNFC_NAMESPACE
 
 Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/)
 {
+    static bool initialized = false;
+    if (initialized)
+        return JNI_VERSION_1_6;
+    initialized = true;
+
     JNIEnv* env;
     if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
         return -1;
diff --git a/src/nfc/qllcpserver_android_p.cpp b/src/nfc/qllcpserver_android_p.cpp
index 8055782b..eb0306a0 100644
--- a/src/nfc/qllcpserver_android_p.cpp
+++ b/src/nfc/qllcpserver_android_p.cpp
@@ -47,6 +47,10 @@ QLlcpServerPrivate::QLlcpServerPrivate(QLlcpServer *q)
 {
 }
 
+QLlcpServerPrivate::~QLlcpServerPrivate()
+{
+}
+
 bool QLlcpServerPrivate::listen(const QString &/*serviceUri*/)
 {
     /*//The server is already listening
diff --git a/src/nfc/qllcpserver_android_p.h b/src/nfc/qllcpserver_android_p.h
index 32e6259c..5d5e2aea 100644
--- a/src/nfc/qllcpserver_android_p.h
+++ b/src/nfc/qllcpserver_android_p.h
@@ -61,6 +61,7 @@ class QLlcpServerPrivate : public QObject
     Q_OBJECT
 public:
     QLlcpServerPrivate(QLlcpServer *q);
+    ~QLlcpServerPrivate();
 
     bool listen(const QString &serviceUri);
     bool isListening() const;