diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:31:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:31:22 +0200 |
| commit | b421290b67507cfe125db206f378fc1b38eaae4e (patch) | |
| tree | c3545d82d65b3b207e80446013f0499ddf0617f8 /src/plugins/sensors/android/src/androidjnisensors.cpp | |
| parent | 614326721259f1424981444ec84b6b9f4d6400ef (diff) | |
| parent | beac0b2e3ea4b292f0473c00bcf68d75360f89ef (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: I4be6cbe9e4ac981f46b3c45d271cac5c7fc677cb
Diffstat (limited to 'src/plugins/sensors/android/src/androidjnisensors.cpp')
| -rw-r--r-- | src/plugins/sensors/android/src/androidjnisensors.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/sensors/android/src/androidjnisensors.cpp b/src/plugins/sensors/android/src/androidjnisensors.cpp index 67fe9078..5e0e4146 100644 --- a/src/plugins/sensors/android/src/androidjnisensors.cpp +++ b/src/plugins/sensors/android/src/androidjnisensors.cpp @@ -247,6 +247,11 @@ static bool registerNatives(JNIEnv *env) Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) { + static bool initialized = false; + if (initialized) + return JNI_VERSION_1_6; + initialized = true; + typedef union { JNIEnv *nativeEnvironment; void *venv; |