Merge remote-tracking branch 'origin/5.7' into dev

Conflicts:
	.qmake.conf

Change-Id: I4be6cbe9e4ac981f46b3c45d271cac5c7fc677cb

10 files changed, 16 insertions, 11 deletions

diff --git a/src/plugins/sensors/android/jar/src/org/qtproject/qt5/android/sensors/QtSensors.java b/src/plugins/sensors/android/jar/src/org/qtproject/qt5/android/sensors/QtSensors.java
index 75f2e933..3067d401 100644
--- a/src/plugins/sensors/android/jar/src/org/qtproject/qt5/android/sensors/QtSensors.java
+++ b/src/plugins/sensors/android/jar/src/org/qtproject/qt5/android/sensors/QtSensors.java
@@ -42,7 +42,7 @@ package org.qtproject.qt5.android.sensors;
 import java.util.HashSet;
 import java.util.List;
 
-import android.app.Activity;
+import android.content.Context;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
@@ -58,10 +58,10 @@ public class QtSensors implements SensorEventListener
     static SensorManager m_sensorManager = null;
     static SparseArray<Sensor> m_registeredSensors = new SparseArray<Sensor>();
     static Object m_syncObject = new Object();
-    static public void setActivity(Activity activity, Object acitvityDelegate)
+    static public void setContext(Context context)
     {
         try {
-            m_sensorManager = (SensorManager)activity.getSystemService(Activity.SENSOR_SERVICE);
+            m_sensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
         } catch(Exception e) {
             e.printStackTrace();
         }
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
diff --git a/src/plugins/sensors/simulator/simulatoraccelerometer.cpp b/src/plugins/sensors/simulator/simulatoraccelerometer.cpp
index 9d2c9290..481128f4 100644
--- a/src/plugins/sensors/simulator/simulatoraccelerometer.cpp
+++ b/src/plugins/sensors/simulator/simulatoraccelerometer.cpp
@@ -54,7 +54,7 @@ void SimulatorAccelerometer::poll()
     QtMobility::QAccelerometerReadingData data = SensorsConnection::instance()->qtAccelerometerData;
     quint64 newTimestamp;
     if (!data.timestamp.isValid())
-        newTimestamp = QDateTime::currentDateTime().toTime_t();
+        newTimestamp = QDateTime::currentMSecsSinceEpoch() / 1000;
     else
         newTimestamp = data.timestamp.toTime_t();
     if (m_reading.x() != data.x
diff --git a/src/plugins/sensors/simulator/simulatorambientlightsensor.cpp b/src/plugins/sensors/simulator/simulatorambientlightsensor.cpp
index fa6f4878..177684fe 100644
--- a/src/plugins/sensors/simulator/simulatorambientlightsensor.cpp
+++ b/src/plugins/sensors/simulator/simulatorambientlightsensor.cpp
@@ -76,7 +76,7 @@ void SimulatorAmbientLightSensor::poll()
 
     quint64 newTimestamp;
     if (!data.timestamp.isValid())
-        newTimestamp = QDateTime::currentDateTime().toTime_t();
+        newTimestamp = QDateTime::currentMSecsSinceEpoch() / 1000;
     else
         newTimestamp = data.timestamp.toTime_t();
     if (m_reading.lightLevel() != convertedLightLevel) {
diff --git a/src/plugins/sensors/simulator/simulatorcompass.cpp b/src/plugins/sensors/simulator/simulatorcompass.cpp
index a64f3a11..fc68c513 100644
--- a/src/plugins/sensors/simulator/simulatorcompass.cpp
+++ b/src/plugins/sensors/simulator/simulatorcompass.cpp
@@ -54,7 +54,7 @@ void SimulatorCompass::poll()
     QtMobility::QCompassReadingData data = SensorsConnection::instance()->qtCompassData;
     quint64 newTimestamp;
     if (!data.timestamp.isValid())
-        newTimestamp = QDateTime::currentDateTime().toTime_t();
+        newTimestamp = QDateTime::currentMSecsSinceEpoch() / 1000;
     else
         newTimestamp = data.timestamp.toTime_t();
     if (m_reading.azimuth() != data.azimuth
diff --git a/src/plugins/sensors/simulator/simulatorirproximitysensor.cpp b/src/plugins/sensors/simulator/simulatorirproximitysensor.cpp
index 02594370..4499128f 100644
--- a/src/plugins/sensors/simulator/simulatorirproximitysensor.cpp
+++ b/src/plugins/sensors/simulator/simulatorirproximitysensor.cpp
@@ -54,7 +54,7 @@ void SimulatorIRProximitySensor::poll()
     QtMobility::QIRProximityReadingData data = SensorsConnection::instance()->qtIRProximityData;
     quint64 newTimestamp;
     if (!data.timestamp.isValid())
-        newTimestamp = QDateTime::currentDateTime().toTime_t();
+        newTimestamp = QDateTime::currentMSecsSinceEpoch() / 1000;
     else
         newTimestamp = data.timestamp.toTime_t();
     if (m_reading.reflectance() != data.irProximity) {
diff --git a/src/plugins/sensors/simulator/simulatorlightsensor.cpp b/src/plugins/sensors/simulator/simulatorlightsensor.cpp
index bdcfadf4..40d9edbd 100644
--- a/src/plugins/sensors/simulator/simulatorlightsensor.cpp
+++ b/src/plugins/sensors/simulator/simulatorlightsensor.cpp
@@ -54,7 +54,7 @@ void SimulatorLightSensor::poll()
     QtMobility::QLightReadingData data = SensorsConnection::instance()->qtLightData;
     quint64 newTimestamp;
     if (!data.timestamp.isValid())
-        newTimestamp = QDateTime::currentDateTime().toTime_t();
+        newTimestamp = QDateTime::currentMSecsSinceEpoch() / 1000;
     else
         newTimestamp = data.timestamp.toTime_t();
     if (m_reading.lux() != data.lux) {
diff --git a/src/plugins/sensors/simulator/simulatormagnetometer.cpp b/src/plugins/sensors/simulator/simulatormagnetometer.cpp
index c3f2c8ac..64a31776 100644
--- a/src/plugins/sensors/simulator/simulatormagnetometer.cpp
+++ b/src/plugins/sensors/simulator/simulatormagnetometer.cpp
@@ -54,7 +54,7 @@ void SimulatorMagnetometer::poll()
     QtMobility::QMagnetometerReadingData data = SensorsConnection::instance()->qtMagnetometerData;
     quint64 newTimestamp;
     if (!data.timestamp.isValid())
-        newTimestamp = QDateTime::currentDateTime().toTime_t();
+        newTimestamp = QDateTime::currentMSecsSinceEpoch() / 1000;
     else
         newTimestamp = data.timestamp.toTime_t();
     if (m_reading.x() != data.x
diff --git a/src/plugins/sensors/simulator/simulatorproximitysensor.cpp b/src/plugins/sensors/simulator/simulatorproximitysensor.cpp
index 74a35f61..b4430959 100644
--- a/src/plugins/sensors/simulator/simulatorproximitysensor.cpp
+++ b/src/plugins/sensors/simulator/simulatorproximitysensor.cpp
@@ -54,7 +54,7 @@ void SimulatorProximitySensor::poll()
     QtMobility::QProximityReadingData data = SensorsConnection::instance()->qtProximityData;
     quint64 newTimestamp;
     if (!data.timestamp.isValid())
-        newTimestamp = QDateTime::currentDateTime().toTime_t();
+        newTimestamp = QDateTime::currentMSecsSinceEpoch() / 1000;
     else
         newTimestamp = data.timestamp.toTime_t();
     if (m_reading.close() != data.close) {