summaryrefslogtreecommitdiffstats
path: root/src/plugins/sensors
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/sensors')
-rw-r--r--src/plugins/sensors/android/src/androidjnisensors.cpp5
-rw-r--r--src/plugins/sensors/dummy/dummy.pro2
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