diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:14:36 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:14:42 +0200 |
commit | 60d1ebac9e81619a24e66fc6defc3e0299491a9d (patch) | |
tree | 39cc5bfb0f6f5b22b0d0a2e71d92ac7e9e69d0e7 /src/nfc | |
parent | 22bffc8c5927d2a6e6b50b05bb6c9db2bc0c7e15 (diff) | |
parent | 71a0d199a29001cc31bfde15aabcc53cf88aae1e (diff) | |
download | qtconnectivity-60d1ebac9e81619a24e66fc6defc3e0299491a9d.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I64352b6cc066255972874e2f9c28abff35f0d613
Diffstat (limited to 'src/nfc')
-rw-r--r-- | src/nfc/android/androidjninfc.cpp | 5 | ||||
-rw-r--r-- | src/nfc/qllcpserver_android_p.cpp | 4 | ||||
-rw-r--r-- | src/nfc/qllcpserver_android_p.h | 1 |
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; |