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 | |
parent | 9d4827207167a2eeab5e6df5dbcdfe12c5e9d6a1 (diff) | |
parent | 8b79fc4ee1c0510c13dc6f1494f37727e3f8c0cf (diff) | |
download | qtsensors-beac0b2e3ea4b292f0473c00bcf68d75360f89ef.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I53d801a88bda3a8b8519b6002e1d37053c03e103
Diffstat (limited to 'src/plugins')
4 files changed, 13 insertions, 7 deletions
diff --git a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp index be26522..6bb65e9 100644 --- a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp @@ -42,9 +42,13 @@ QT_BEGIN_NAMESPACE -QCoverSensorGestureRecognizer::QCoverSensorGestureRecognizer(QObject *parent) : - QSensorGestureRecognizer(parent), - orientationReading(0), proximityReading(0),active(0), detecting(0) +QCoverSensorGestureRecognizer::QCoverSensorGestureRecognizer(QObject *parent) + : QSensorGestureRecognizer(parent), + orientationReading(0), + proximityReading(0), + timer(0), + active(0), + detecting(0) { } @@ -120,7 +124,6 @@ void QCoverSensorGestureRecognizer::proximityChanged(QProximityReading *reading) detecting = true; } } - lastTs = reading->timestamp(); } void QCoverSensorGestureRecognizer::orientationReadingChanged(QOrientationReading *reading) diff --git a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h index e7ca3ab..1478e70 100644 --- a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h +++ b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h @@ -76,10 +76,8 @@ private: bool proximityReading; QTimer *timer; - QtSensorGestureSensorHandler *handler; bool active; bool detecting; - qreal lastTs; }; QT_END_NAMESPACE diff --git a/src/plugins/sensors/android/src/androidjnisensors.cpp b/src/plugins/sensors/android/src/androidjnisensors.cpp index 67fe907..5e0e414 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 b4ef2fd..6eab491 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 |