diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 10:47:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 10:47:04 +0200 |
| commit | beac0b2e3ea4b292f0473c00bcf68d75360f89ef (patch) | |
| tree | 099c0406f04240a391206b8e671be8cfa2714fe0 /src/plugins/sensors | |
| parent | 9d4827207167a2eeab5e6df5dbcdfe12c5e9d6a1 (diff) | |
| parent | 8b79fc4ee1c0510c13dc6f1494f37727e3f8c0cf (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I53d801a88bda3a8b8519b6002e1d37053c03e103
Diffstat (limited to 'src/plugins/sensors')
| -rw-r--r-- | src/plugins/sensors/android/src/androidjnisensors.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/sensors/dummy/dummy.pro | 2 |
2 files changed, 6 insertions, 1 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; diff --git a/src/plugins/sensors/dummy/dummy.pro b/src/plugins/sensors/dummy/dummy.pro index b4ef2fda..6eab4912 100644 --- a/src/plugins/sensors/dummy/dummy.pro +++ b/src/plugins/sensors/dummy/dummy.pro @@ -12,7 +12,7 @@ SOURCES += dummycommon.cpp\ OTHER_FILES = plugin.json -unix:!mac:!qnx:!android:LIBS+=-lrt +unix:!darwin:!qnx:!android:!openbsd: LIBS += -lrt PLUGIN_TYPE = sensors PLUGIN_CLASS_NAME = dummySensorPlugin |