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

Change-Id: Ia02497aafc94feba0381ffe8733cbc89f29fb412

12 files changed, 23 insertions, 24 deletions

diff --git a/doc/config/qtsensors.qdocconf b/doc/config/qtsensors.qdocconf
index 44e5807a..2fbeea03 100644
--- a/doc/config/qtsensors.qdocconf
+++ b/doc/config/qtsensors.qdocconf
@@ -1,4 +1,3 @@
-include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 #include(compat.qdocconf)
diff --git a/src/imports/sensors/qmlaccelerometer.h b/src/imports/sensors/qmlaccelerometer.h
index 7a9a4cd0..3c126d0f 100644
--- a/src/imports/sensors/qmlaccelerometer.h
+++ b/src/imports/sensors/qmlaccelerometer.h
@@ -69,7 +69,7 @@ public:
     void setAccelerationMode(AccelerationMode accelerationMode);
 
 signals:
-    void accelerationModeChanged(AccelerationMode accelerationMode);
+    Q_REVISION(1) void accelerationModeChanged(AccelerationMode accelerationMode);
 
 private:
     QSensor *sensor() const Q_DECL_OVERRIDE;
diff --git a/src/imports/sensors/qmlsensor.h b/src/imports/sensors/qmlsensor.h
index f72234ae..64568d8d 100644
--- a/src/imports/sensors/qmlsensor.h
+++ b/src/imports/sensors/qmlsensor.h
@@ -153,13 +153,13 @@ Q_SIGNALS:
     void descriptionChanged();
     void errorChanged();
     void alwaysOnChanged();
-    void skipDuplicatesChanged(bool skipDuplicates);
-    void axesOrientationModeChanged(AxesOrientationMode axesOrientationMode);
-    void currentOrientationChanged(int currentOrientation);
-    void userOrientationChanged(int userOrientation);
-    void maxBufferSizeChanged(int maxBufferSize);
-    void efficientBufferSizeChanged(int efficientBufferSize);
-    void bufferSizeChanged(int bufferSize);
+    Q_REVISION(1) void skipDuplicatesChanged(bool skipDuplicates);
+    Q_REVISION(1) void axesOrientationModeChanged(AxesOrientationMode axesOrientationMode);
+    Q_REVISION(1) void currentOrientationChanged(int currentOrientation);
+    Q_REVISION(1) void userOrientationChanged(int userOrientation);
+    Q_REVISION(1) void maxBufferSizeChanged(int maxBufferSize);
+    Q_REVISION(1) void efficientBufferSizeChanged(int efficientBufferSize);
+    Q_REVISION(1) void bufferSizeChanged(int bufferSize);
 
 protected:
     virtual QSensor *sensor() const = 0;
diff --git a/src/plugins/sensors/android/src/androidaccelerometer.cpp b/src/plugins/sensors/android/src/androidaccelerometer.cpp
index b64536ef..36ce08e3 100644
--- a/src/plugins/sensors/android/src/androidaccelerometer.cpp
+++ b/src/plugins/sensors/android/src/androidaccelerometer.cpp
@@ -49,7 +49,7 @@ void AndroidAccelerometer::onSensorChanged(jlong timestamp, const jfloat *values
 {
     if (size < 3)
         return;
-    m_reader.setTimestamp(timestamp);
+    m_reader.setTimestamp(timestamp/1000);
     // check https://developer.android.com/reference/android/hardware/SensorEvent.html#values
     m_reader.setX(values[0]);
     m_reader.setY(values[1]);
diff --git a/src/plugins/sensors/android/src/androidgyroscope.cpp b/src/plugins/sensors/android/src/androidgyroscope.cpp
index 69a05c18..9d445af1 100644
--- a/src/plugins/sensors/android/src/androidgyroscope.cpp
+++ b/src/plugins/sensors/android/src/androidgyroscope.cpp
@@ -50,7 +50,7 @@ void AndroidGyroscope::onSensorChanged(jlong timestamp, const jfloat *values, ui
 {
     if (size < 3)
         return;
-    m_reader.setTimestamp(timestamp);
+    m_reader.setTimestamp(timestamp/1000);
     // check https://developer.android.com/reference/android/hardware/SensorEvent.html#values
     m_reader.setX(values[0]*180/M_PI);
     m_reader.setY(values[1]*180/M_PI);
diff --git a/src/plugins/sensors/android/src/androidlight.cpp b/src/plugins/sensors/android/src/androidlight.cpp
index 42295e54..7c059de9 100644
--- a/src/plugins/sensors/android/src/androidlight.cpp
+++ b/src/plugins/sensors/android/src/androidlight.cpp
@@ -55,7 +55,7 @@ void AndroidLight::onSensorChanged(jlong timestamp, const jfloat *values, uint s
 {
     if (size < 1)
         return;
-    m_reader.setTimestamp(timestamp);
+    m_reader.setTimestamp(timestamp/1000);
     // check https://developer.android.com/reference/android/hardware/SensorEvent.html#values
     m_reader.setLux(values[0]);
     newReadingAvailable();
diff --git a/src/plugins/sensors/android/src/androidmagnetometer.cpp b/src/plugins/sensors/android/src/androidmagnetometer.cpp
index 9175f584..e6b4de5a 100644
--- a/src/plugins/sensors/android/src/androidmagnetometer.cpp
+++ b/src/plugins/sensors/android/src/androidmagnetometer.cpp
@@ -54,7 +54,7 @@ void AndroidMagnetometer::onSensorChanged(jlong timestamp, const jfloat *values,
 {
     if (size<3)
         return;
-    m_reader.setTimestamp(timestamp);
+    m_reader.setTimestamp(timestamp/1000);
     // check https://developer.android.com/reference/android/hardware/SensorEvent.html#values
     m_reader.setX(values[0]/1e6);
     m_reader.setY(values[1]/1e6);
diff --git a/src/plugins/sensors/android/src/androidrotation.cpp b/src/plugins/sensors/android/src/androidrotation.cpp
index 602575fe..d529558b 100644
--- a/src/plugins/sensors/android/src/androidrotation.cpp
+++ b/src/plugins/sensors/android/src/androidrotation.cpp
@@ -55,7 +55,7 @@ void AndroidRotation::onSensorChanged(jlong timestamp, const jfloat *values, uin
 {
     if (size < 3)
         return;
-    m_reader.setTimestamp(timestamp);
+    m_reader.setTimestamp(timestamp/1000);
 
     float rz = -values[0]*180/M_PI;
     float rx = -values[1]*180/M_PI;
diff --git a/src/plugins/sensors/dummy/dummycommon.cpp b/src/plugins/sensors/dummy/dummycommon.cpp
index 33e71119..675e54b6 100644
--- a/src/plugins/sensors/dummy/dummycommon.cpp
+++ b/src/plugins/sensors/dummy/dummycommon.cpp
@@ -151,6 +151,7 @@ quint64 dummycommon::getTimestamp()
     int ok;
     ok = clock_gettime(CLOCK_MONOTONIC, &tv);
     Q_ASSERT(ok == 0);
+    Q_UNUSED(ok);
 
     quint64 result = (tv.tv_sec * 1000000ULL) + (tv.tv_nsec * 0.001); // scale to microseconds
     return result;
diff --git a/src/sensors/qsensor.cpp b/src/sensors/qsensor.cpp
index 4b8ca2d5..bca6358b 100644
--- a/src/sensors/qsensor.cpp
+++ b/src/sensors/qsensor.cpp
@@ -143,10 +143,13 @@ QT_BEGIN_NAMESPACE
     \sa QList, qoutputrange, QSensor::outputRanges
 */
 
-// A bit of a hack to call qRegisterMetaType when the library is loaded.
-static int qrange_id = qRegisterMetaType<qrange>("qrange");
-static int qrangelist_id = qRegisterMetaType<qrangelist>("qrangelist");
-static int qoutputrangelist_id = qRegisterMetaType<qoutputrangelist>("qoutputrangelist");
+static void registerTypes()
+{
+    qRegisterMetaType<qrange>("qrange");
+    qRegisterMetaType<qrangelist>("qrangelist");
+    qRegisterMetaType<qoutputrangelist>("qoutputrangelist");
+}
+Q_CONSTRUCTOR_FUNCTION(registerTypes)
 
 // =====================================================================
 
@@ -1039,7 +1042,6 @@ int QSensor::maxBufferSize() const
 */
 void QSensor::setMaxBufferSize(int maxBufferSize)
 {
-    // ### Qt 6: Remove the entire maxBufferSize property, no backend really uses it
     Q_D(QSensor);
     if (d->maxBufferSize != maxBufferSize) {
         d->maxBufferSize = maxBufferSize;
@@ -1070,7 +1072,6 @@ int QSensor::efficientBufferSize() const
 */
 void QSensor::setEfficientBufferSize(int efficientBufferSize)
 {
-    // ### Qt 6: Remove the entire efficientBufferSize property, no backend really uses it
     Q_D(QSensor);
     if (d->efficientBufferSize != efficientBufferSize) {
         d->efficientBufferSize = efficientBufferSize;
@@ -1121,8 +1122,6 @@ int QSensor::bufferSize() const
 
 void QSensor::setBufferSize(int bufferSize)
 {
-    // ### Qt 6: Currently only the Blackberry backend supports this, but only as an on/off switch.
-    //           We should consider changing this to a more appropriate API.
     Q_D(QSensor);
     if (d->bufferSize != bufferSize) {
         d->bufferSize = bufferSize;
diff --git a/src/sensors/qsensor.h b/src/sensors/qsensor.h
index 8512d4c6..b83d736b 100644
--- a/src/sensors/qsensor.h
+++ b/src/sensors/qsensor.h
@@ -90,7 +90,7 @@ class Q_SENSORS_EXPORT QSensor : public QObject
     Q_PROPERTY(int outputRange READ outputRange WRITE setOutputRange)
     Q_PROPERTY(QString description READ description)
     Q_PROPERTY(int error READ error NOTIFY sensorError)
-    Q_PROPERTY(bool alwaysOn READ isAlwaysOn WRITE setAlwaysOn NOTIFY alwaysOnChanged REVISION 1)
+    Q_PROPERTY(bool alwaysOn READ isAlwaysOn WRITE setAlwaysOn NOTIFY alwaysOnChanged)
     Q_PROPERTY(bool skipDuplicates READ skipDuplicates WRITE setSkipDuplicates NOTIFY skipDuplicatesChanged)
     Q_PROPERTY(AxesOrientationMode axesOrientationMode READ axesOrientationMode WRITE setAxesOrientationMode NOTIFY axesOrientationModeChanged)
     Q_PROPERTY(int currentOrientation READ currentOrientation NOTIFY currentOrientationChanged)
diff --git a/src/sensors/qtapsensor.h b/src/sensors/qtapsensor.h
index 74ca40c2..b8704114 100644
--- a/src/sensors/qtapsensor.h
+++ b/src/sensors/qtapsensor.h
@@ -107,7 +107,7 @@ Q_SIGNALS:
     void returnDoubleTapEventsChanged(bool returnDoubleTapEvents);
 
 private:
-    Q_DECLARE_PRIVATE(QTapSensor);
+    Q_DECLARE_PRIVATE(QTapSensor)
     Q_DISABLE_COPY(QTapSensor)
 };