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

Change-Id: I43577461af4808e48de9b229843f324f195ae3d0

58 files changed, 280 insertions, 199 deletions

diff --git a/dist/changes-5.6.0 b/dist/changes-5.6.0
new file mode 100644
index 0000000..6c2403e
--- /dev/null
+++ b/dist/changes-5.6.0
@@ -0,0 +1,27 @@
+Qt 5.6 introduces many new features and improvements as well as bugfixes
+over the 5.5.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+  http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.6 series is binary compatible with the 5.5.x series.
+Applications compiled for 5.5 will continue to run with 5.6.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                           Library                                        *
+****************************************************************************
+
+QtSensors
+---------
+
+ - Fixed minor documentation issues.
+ - Improved various examples
+ - [QTBUG-49741] Fixed hanging WinRT sensor plugin.
diff --git a/examples/sensors/accelbubble/doc/images/accelbubble.png b/examples/sensors/accelbubble/doc/images/accelbubble.png
index 84e876d..ad4cfc0 100644
--- a/examples/sensors/accelbubble/doc/images/accelbubble.png
+++ b/examples/sensors/accelbubble/doc/images/accelbubble.png
diff --git a/examples/sensors/grue/doc/images/qtsensors-examples-grue.png b/examples/sensors/grue/doc/images/qtsensors-examples-grue.png
index 81b3725..f434827 100644
--- a/examples/sensors/grue/doc/images/qtsensors-examples-grue.png
+++ b/examples/sensors/grue/doc/images/qtsensors-examples-grue.png
diff --git a/examples/sensors/grue/grue.png b/examples/sensors/grue/grue.png
index f0b070b..2727d39 100644
--- a/examples/sensors/grue/grue.png
+++ b/examples/sensors/grue/grue.png
diff --git a/examples/sensors/maze/components/images/button_background_pressed.png b/examples/sensors/maze/components/images/button_background_pressed.png
index 149529e..e0ba0e7 100644
--- a/examples/sensors/maze/components/images/button_background_pressed.png
+++ b/examples/sensors/maze/components/images/button_background_pressed.png
diff --git a/examples/sensors/maze/content/00.png b/examples/sensors/maze/content/00.png
index ab29a62..2522be5 100644
--- a/examples/sensors/maze/content/00.png
+++ b/examples/sensors/maze/content/00.png
diff --git a/examples/sensors/maze/content/01.png b/examples/sensors/maze/content/01.png
index 0e70d1b..6146b20 100644
--- a/examples/sensors/maze/content/01.png
+++ b/examples/sensors/maze/content/01.png
diff --git a/examples/sensors/maze/content/cheese.png b/examples/sensors/maze/content/cheese.png
index ecef450..c737b9d 100644
--- a/examples/sensors/maze/content/cheese.png
+++ b/examples/sensors/maze/content/cheese.png
diff --git a/examples/sensors/maze/content/start.png b/examples/sensors/maze/content/start.png
index 698c0b1..581b8c9 100644
--- a/examples/sensors/maze/content/start.png
+++ b/examples/sensors/maze/content/start.png
diff --git a/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png b/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png
index 149529e..e0ba0e7 100644
--- a/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png
+++ b/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png
diff --git a/examples/sensors/qmlqtsensors/qmlqtsensors.qml b/examples/sensors/qmlqtsensors/qmlqtsensors.qml
index bc456be..40492c7 100644
--- a/examples/sensors/qmlqtsensors/qmlqtsensors.qml
+++ b/examples/sensors/qmlqtsensors/qmlqtsensors.qml
@@ -106,18 +106,18 @@ ApplicationWindow {
         active: false
         //! [5]
         onReadingChanged: {
-            if (reading.lightLevel == AmbientLightSensor.Unknown)
-                ambientlighttext.text = "Ambient light: Unknown";
-            else if (reading.lightLevel == AmbientLightSensor.Dark)
+            if (reading.lightLevel == AmbientLightReading.Dark)
                 ambientlighttext.text = "Ambient light: Dark";
-            else if (reading.lightLevel == AmbientLightSensor.Twilight)
+            else if (reading.lightLevel == AmbientLightReading.Twilight)
                 ambientlighttext.text = "Ambient light: Twilight";
-            else if (reading.lightLevel == AmbientLightSensor.Light)
+            else if (reading.lightLevel == AmbientLightReading.Light)
                 ambientlighttext.text = "Ambient light: Light";
-            else if (reading.lightLevel == AmbientLightSensor.Bright)
+            else if (reading.lightLevel == AmbientLightReading.Bright)
                 ambientlighttext.text = "Ambient light: Bright";
-            else if (reading.lightLevel == AmbientLightSensor.Sunny)
+            else if (reading.lightLevel == AmbientLightReading.Sunny)
                 ambientlighttext.text = "Ambient light: Sunny";
+            else
+                ambientlighttext.text = "Ambient light: Unknown";
         }
         //! [5]
     }
@@ -160,7 +160,7 @@ ApplicationWindow {
                 height: 30
                 verticalAlignment: Text.AlignVCenter
                 //! [3]
-                text: "X Rotation: " + tilt.xRotation + "°"
+                text: "X Rotation: " + (tilt.reading ? tilt.reading.xRotation.toFixed(2) + "°" : "Unknown")
                 //! [3]
             }
         }
@@ -184,7 +184,7 @@ ApplicationWindow {
                 height: 30
                 verticalAlignment: Text.AlignVCenter
                 //! [4]
-                text: "Y Rotation: " + tilt.yRotation +  "°"
+                text: "Y Rotation: " + (tilt.reading ? tilt.reading.yRotation.toFixed(2) + "°" : "Unknown")
                 //! [4]
             }
         }
diff --git a/examples/sensors/sensor_explorer/doc/images/qtsensors-examples-explorer.png b/examples/sensors/sensor_explorer/doc/images/qtsensors-examples-explorer.png
index 0976b9f..888fc3c 100644
--- a/examples/sensors/sensor_explorer/doc/images/qtsensors-examples-explorer.png
+++ b/examples/sensors/sensor_explorer/doc/images/qtsensors-examples-explorer.png
diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes
index 746230b..2c72e1f 100644
--- a/src/imports/sensors/plugins.qmltypes
+++ b/src/imports/sensors/plugins.qmltypes
@@ -7,7 +7,7 @@ import QtQuick.tooling 1.2
 // 'qmlplugindump -nonrelocatable QtSensors 5.6'
 
 Module {
-    dependencies: []
+    dependencies: ["QtQuick 2.0"]
     Component {
         name: "QmlAccelerometer"
         prototype: "QmlSensor"
diff --git a/src/imports/sensors/qmlrotationsensor.h b/src/imports/sensors/qmlrotationsensor.h
index 66da0b7..0c79c3d 100644
--- a/src/imports/sensors/qmlrotationsensor.h
+++ b/src/imports/sensors/qmlrotationsensor.h
@@ -61,7 +61,7 @@ Q_SIGNALS:
 
 private:
     QSensor *sensor() const Q_DECL_OVERRIDE;
-    void _update();
+    void _update() Q_DECL_OVERRIDE;
     QRotationSensor *m_sensor;
     QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
 };
diff --git a/src/plugins/sensorgestures/qtsensors/qtsensors.pro b/src/plugins/sensorgestures/qtsensors/qtsensors.pro
index 3f8df03..44f18ff 100644
--- a/src/plugins/sensorgestures/qtsensors/qtsensors.pro
+++ b/src/plugins/sensorgestures/qtsensors/qtsensors.pro
@@ -1,11 +1,6 @@
 TARGET = qtsensorgestures_plugin
 QT = core sensors
 
-PLUGIN_TYPE = sensorgestures
-PLUGIN_CLASS_NAME = QtSensorGesturePlugin
-PLUGIN_EXTENDS = -
-load(qt_plugin)
-
 # Input
 HEADERS += qtsensorgestureplugin.h \
     qcoversensorgesturerecognizer.h \
@@ -36,3 +31,7 @@ SOURCES += qtsensorgestureplugin.cpp \
 OTHER_FILES += \
     plugin.json
 
+PLUGIN_TYPE = sensorgestures
+PLUGIN_CLASS_NAME = QtSensorGesturePlugin
+PLUGIN_EXTENDS = -
+load(qt_plugin)
diff --git a/src/plugins/sensorgestures/shake/shake.pro b/src/plugins/sensorgestures/shake/shake.pro
index d7d8f92..efa2a0c 100644
--- a/src/plugins/sensorgestures/shake/shake.pro
+++ b/src/plugins/sensorgestures/shake/shake.pro
@@ -1,11 +1,6 @@
 TARGET = qtsensorgestures_shakeplugin
 QT = core sensors
 
-PLUGIN_TYPE = sensorgestures
-PLUGIN_CLASS_NAME = QShakeSensorGesturePlugin
-PLUGIN_EXTENDS = -
-load(qt_plugin)
-
 # Input
 HEADERS += qshakesensorgestureplugin.h \
            qshakerecognizer.h
@@ -15,3 +10,7 @@ SOURCES += qshakesensorgestureplugin.cpp \
 OTHER_FILES += \
     plugin.json
 
+PLUGIN_TYPE = sensorgestures
+PLUGIN_CLASS_NAME = QShakeSensorGesturePlugin
+PLUGIN_EXTENDS = -
+load(qt_plugin)
diff --git a/src/plugins/sensors/android/src/src.pro b/src/plugins/sensors/android/src/src.pro
index 23a6bea..8366944 100644
--- a/src/plugins/sensors/android/src/src.pro
+++ b/src/plugins/sensors/android/src/src.pro
@@ -1,9 +1,6 @@
 TARGET = qtsensors_android
-QT = sensors core
 
-PLUGIN_TYPE = sensors
-PLUGIN_CLASS_NAME = QCounterGesturePlugin
-load(qt_plugin)
+QT = sensors core
 
 # STATICPLUGIN needed because there's a Q_IMPORT_PLUGIN in main.cpp
 # Yes, the plugin imports itself statically
@@ -36,3 +33,7 @@ SOURCES = \
     androidlight.cpp
 
 OTHER_FILES = plugin.json
+
+PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = QCounterGesturePlugin
+load(qt_plugin)
diff --git a/src/plugins/sensors/dummy/dummy.pro b/src/plugins/sensors/dummy/dummy.pro
index 93f54dc..b4ef2fd 100644
--- a/src/plugins/sensors/dummy/dummy.pro
+++ b/src/plugins/sensors/dummy/dummy.pro
@@ -1,10 +1,6 @@
 TARGET = qtsensors_dummy
 QT = sensors core
 
-PLUGIN_TYPE = sensors
-PLUGIN_CLASS_NAME = dummySensorPlugin
-load(qt_plugin)
-
 HEADERS += dummycommon.h\
            dummyaccelerometer.h\
            dummylightsensor.h
@@ -17,3 +13,7 @@ SOURCES += dummycommon.cpp\
 OTHER_FILES = plugin.json
 
 unix:!mac:!qnx:!android:LIBS+=-lrt
+
+PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = dummySensorPlugin
+load(qt_plugin)
diff --git a/src/plugins/sensors/generic/generic.pro b/src/plugins/sensors/generic/generic.pro
index cdb9300..cf87ccf 100644
--- a/src/plugins/sensors/generic/generic.pro
+++ b/src/plugins/sensors/generic/generic.pro
@@ -1,10 +1,6 @@
 TARGET = qtsensors_generic
 QT = core sensors
 
-PLUGIN_TYPE = sensors
-PLUGIN_CLASS_NAME = genericSensorPlugin
-load(qt_plugin)
-
 HEADERS += generictiltsensor.h
 
 SOURCES += main.cpp\
@@ -27,3 +23,7 @@ DEFINES += QTSENSORS_GENERICORIENTATIONSENSOR QTSENSORS_GENERICALSSENSOR
 }
 
 OTHER_FILES = plugin.json
+
+PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = genericSensorPlugin
+load(qt_plugin)
diff --git a/src/plugins/sensors/generic/generictiltsensor.h b/src/plugins/sensors/generic/generictiltsensor.h
index 52c5f7c..9562aca 100644
--- a/src/plugins/sensors/generic/generictiltsensor.h
+++ b/src/plugins/sensors/generic/generictiltsensor.h
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
 
 class GenericTiltSensor : public QSensorBackend, public QAccelerometerFilter
 {
+    Q_OBJECT
 public:
 
     static char const * const id;
@@ -57,7 +58,7 @@ public:
     void start() Q_DECL_OVERRIDE;
     void stop() Q_DECL_OVERRIDE;
 
-    void calibrate();
+    Q_INVOKABLE void calibrate();
 
     bool filter(QAccelerometerReading *reading) Q_DECL_OVERRIDE;
 
diff --git a/src/plugins/sensors/ios/ios.pro b/src/plugins/sensors/ios/ios.pro
index 4197b14..17ff009 100644
--- a/src/plugins/sensors/ios/ios.pro
+++ b/src/plugins/sensors/ios/ios.pro
@@ -1,10 +1,6 @@
 TARGET = qtsensors_ios
 QT = core sensors
 
-PLUGIN_TYPE = sensors
-PLUGIN_CLASS_NAME = IOSSensorPlugin
-load(qt_plugin)
-
 OTHER_FILES = plugin.json
 
 HEADERS += iosaccelerometer.h \
@@ -23,3 +19,7 @@ OBJECTIVE_SOURCES += main.mm \
     iosproximitysensor.mm
 
 LIBS += -framework UIKit -framework CoreMotion -framework CoreLocation
+
+PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = IOSSensorPlugin
+load(qt_plugin)
diff --git a/src/plugins/sensors/linux/linux.pro b/src/plugins/sensors/linux/linux.pro
index 636bd1b..33706e7 100644
--- a/src/plugins/sensors/linux/linux.pro
+++ b/src/plugins/sensors/linux/linux.pro
@@ -1,13 +1,13 @@
 TARGET = qtsensors_linuxsys
 QT = core sensors
 
-PLUGIN_TYPE = sensors
-PLUGIN_CLASS_NAME = LinuxSensorPlugin
-load(qt_plugin)
-
 OTHER_FILES = plugin.json
 
 !android:LIBS += -lrt
 HEADERS += linuxsysaccelerometer.h
 SOURCES += linuxsysaccelerometer.cpp \
 main.cpp
+
+PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = LinuxSensorPlugin
+load(qt_plugin)
diff --git a/src/plugins/sensors/sensorfw/sensorfw.pro b/src/plugins/sensors/sensorfw/sensorfw.pro
index 6c1408b..b30b362 100644
--- a/src/plugins/sensors/sensorfw/sensorfw.pro
+++ b/src/plugins/sensors/sensorfw/sensorfw.pro
@@ -1,10 +1,6 @@
 TARGET = qtsensors_sensorfw
 QT = core sensors network dbus
 
-PLUGIN_TYPE = sensors
-PLUGIN_CLASS_NAME = sensorfwSensorPlugin
-load(qt_plugin)
-
 include(sensorfw.pri)
 
 
@@ -16,3 +12,7 @@ CONFIGFILES.path = /etc/xdg/QtProject/
 INSTALLS += CONFIGFILES
 
 OTHER_FILES = plugin.json
+
+PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = sensorfwSensorPlugin
+load(qt_plugin)
diff --git a/src/plugins/sensors/simulator/simulator.pro b/src/plugins/sensors/simulator/simulator.pro
index b110137..ac8ea50 100644
--- a/src/plugins/sensors/simulator/simulator.pro
+++ b/src/plugins/sensors/simulator/simulator.pro
@@ -1,9 +1,5 @@
 TARGET = qtsensors_simulator
 
-PLUGIN_TYPE = sensors
-PLUGIN_CLASS_NAME = SimulatorSensorPlugin
-load(qt_plugin)
-
 QT=core gui network sensors simulator
 
 HEADERS += \
@@ -30,3 +26,7 @@ SOURCES += \
     main.cpp
 
 OTHER_FILES = plugin.json
+
+PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = SimulatorSensorPlugin
+load(qt_plugin)
diff --git a/src/plugins/sensors/winrt/winrt.pro b/src/plugins/sensors/winrt/winrt.pro
index 4a03bf2..21996fd 100644
--- a/src/plugins/sensors/winrt/winrt.pro
+++ b/src/plugins/sensors/winrt/winrt.pro
@@ -1,9 +1,5 @@
 TARGET = qtsensors_winrt
-QT = sensors core
-
-PLUGIN_TYPE = sensors
-PLUGIN_CLASS_NAME = WinRtSensorPlugin
-load(qt_plugin)
+QT = sensors core core_private
 
 HEADERS += \
     winrtaccelerometer.h \
@@ -25,3 +21,7 @@ SOURCES += \
     winrtgyroscope.cpp
 
 OTHER_FILES = plugin.json
+
+PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = WinRtSensorPlugin
+load(qt_plugin)
diff --git a/src/plugins/sensors/winrt/winrtaccelerometer.cpp b/src/plugins/sensors/winrt/winrtaccelerometer.cpp
index f2728a8..fba9594 100644
--- a/src/plugins/sensors/winrt/winrtaccelerometer.cpp
+++ b/src/plugins/sensors/winrt/winrtaccelerometer.cpp
@@ -38,7 +38,9 @@
 #include "winrtcommon.h"
 
 #include <QtSensors/QAccelerometerReading>
+#include <private/qeventdispatcher_winrt_p.h>
 
+#include <functional>
 #include <wrl.h>
 #include <windows.devices.sensors.h>
 using namespace Microsoft::WRL;
@@ -114,20 +116,24 @@ WinRtAccelerometer::WinRtAccelerometer(QSensor *sensor)
     : QSensorBackend(sensor), d_ptr(new WinRtAccelerometerPrivate(this))
 {
     Q_D(WinRtAccelerometer);
-    HStringReference classId(RuntimeClass_Windows_Devices_Sensors_Accelerometer);
-    ComPtr<IAccelerometerStatics> factory;
-    HRESULT hr = RoGetActivationFactory(classId.Get(), IID_PPV_ARGS(&factory));
-    if (FAILED(hr)) {
-        qCWarning(lcWinRtSensors) << "Unable to initialize accelerometer factory."
-                                  << qt_error_string(hr);
-        sensorError(hr);
-        return;
-    }
+    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+        HStringReference classId(RuntimeClass_Windows_Devices_Sensors_Accelerometer);
+        ComPtr<IAccelerometerStatics> factory;
+        HRESULT hr = RoGetActivationFactory(classId.Get(), IID_PPV_ARGS(&factory));
+        if (FAILED(hr)) {
+            qCWarning(lcWinRtSensors) << "Unable to initialize accelerometer factory."
+                                      << qt_error_string(hr);
+            return hr;
+        }
 
-    hr = factory->GetDefault(&d->sensor);
+        hr = factory->GetDefault(&d->sensor);
+        if (FAILED(hr)) {
+            qCWarning(lcWinRtSensors) << "Unable to get default accelerometer."
+                                      << qt_error_string(hr);
+        }
+        return hr;
+    });
     if (FAILED(hr) || !d->sensor) {
-        qCWarning(lcWinRtSensors) << "Unable to get default accelerometer."
-                                  << qt_error_string(hr);
         sensorError(hr);
         return;
     }
@@ -158,9 +164,11 @@ void WinRtAccelerometer::start()
     if (d->token.value)
         return;
 
-    ComPtr<AccelerometerReadingHandler> callback =
+    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+        ComPtr<AccelerometerReadingHandler> callback =
             Callback<AccelerometerReadingHandler>(d, &WinRtAccelerometerPrivate::readingChanged);
-    HRESULT hr = d->sensor->add_ReadingChanged(callback.Get(), &d->token);
+        return d->sensor->add_ReadingChanged(callback.Get(), &d->token);
+    });
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to attach to reading changed event."
                                   << qt_error_string(hr);
@@ -189,14 +197,16 @@ void WinRtAccelerometer::stop()
     if (!d->token.value)
         return;
 
-    HRESULT hr = d->sensor->remove_ReadingChanged(d->token);
+    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+        return d->sensor->remove_ReadingChanged(d->token);
+    });
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to detach from reading changed event."
                                   << qt_error_string(hr);
         sensorError(hr);
         return;
     }
-    d->sensor->put_ReportInterval(0);
+    hr = d->sensor->put_ReportInterval(0);
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to reset report interval."
                                   << qt_error_string(hr);
diff --git a/src/plugins/sensors/winrt/winrtambientlightsensor.cpp b/src/plugins/sensors/winrt/winrtambientlightsensor.cpp
index b1e1c52..d0d7fd7 100644
--- a/src/plugins/sensors/winrt/winrtambientlightsensor.cpp
+++ b/src/plugins/sensors/winrt/winrtambientlightsensor.cpp
@@ -38,7 +38,9 @@
 #include "winrtcommon.h"
 
 #include <QtSensors/QAmbientLightSensor>
+#include <private/qeventdispatcher_winrt_p.h>
 
+#include <functional>
 #include <wrl.h>
 #include <windows.devices.sensors.h>
 using namespace Microsoft::WRL;
@@ -113,20 +115,24 @@ WinRtAmbientLightSensor::WinRtAmbientLightSensor(QSensor *sensor)
     : QSensorBackend(sensor), d_ptr(new WinRtAmbientLightSensorPrivate(this))
 {
     Q_D(WinRtAmbientLightSensor);
-    HStringReference classId(RuntimeClass_Windows_Devices_Sensors_LightSensor);
-    ComPtr<ILightSensorStatics> factory;
-    HRESULT hr = RoGetActivationFactory(classId.Get(), IID_PPV_ARGS(&factory));
-    if (FAILED(hr)) {
-        qCWarning(lcWinRtSensors) << "Unable to initialize light sensor factory."
-                                  << qt_error_string(hr);
-        sensorError(hr);
-        return;
-    }
+    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+        HStringReference classId(RuntimeClass_Windows_Devices_Sensors_LightSensor);
+        ComPtr<ILightSensorStatics> factory;
+        HRESULT hr = RoGetActivationFactory(classId.Get(), IID_PPV_ARGS(&factory));
+        if (FAILED(hr)) {
+            qCWarning(lcWinRtSensors) << "Unable to initialize light sensor factory."
+                                      << qt_error_string(hr);
+            return hr;
+        }
 
-    hr = factory->GetDefault(&d->sensor);
+        hr = factory->GetDefault(&d->sensor);
+        if (FAILED(hr)) {
+            qCWarning(lcWinRtSensors) << "Unable to get default light sensor."
+                                      << qt_error_string(hr);
+        }
+        return hr;
+    });
     if (FAILED(hr) || !d->sensor) {
-        qCWarning(lcWinRtSensors) << "Unable to get default light sensor."
-                                  << qt_error_string(hr);
         sensorError(hr);
         return;
     }
@@ -157,9 +163,11 @@ void WinRtAmbientLightSensor::start()
     if (d->token.value)
         return;
 
-    ComPtr<LightSensorReadingHandler> callback =
+    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+        ComPtr<LightSensorReadingHandler> callback =
             Callback<LightSensorReadingHandler>(d, &WinRtAmbientLightSensorPrivate::readingChanged);
-    HRESULT hr = d->sensor->add_ReadingChanged(callback.Get(), &d->token);
+        return d->sensor->add_ReadingChanged(callback.Get(), &d->token);
+    });
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to attach to reading changed event."
                                   << qt_error_string(hr);
@@ -188,14 +196,16 @@ void WinRtAmbientLightSensor::stop()
     if (!d->token.value)
         return;
 
-    HRESULT hr = d->sensor->remove_ReadingChanged(d->token);
+    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+        return d->sensor->remove_ReadingChanged(d->token);
+    });
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to detach from reading changed event."
                                   << qt_error_string(hr);
         sensorError(hr);
         return;
     }
-    d->sensor->put_ReportInterval(0);
+    hr = d->sensor->put_ReportInterval(0);
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to reset report interval."
                                   << qt_error_string(hr);
diff --git a/src/plugins/sensors/winrt/winrtcompass.cpp b/src/plugins/sensors/winrt/winrtcompass.cpp
index 9c57db9..22f4ac5 100644
--- a/src/plugins/sensors/winrt/winrtcompass.cpp
+++ b/src/plugins/sensors/winrt/winrtcompass.cpp
@@ -38,9 +38,9 @@
 #include "winrtcommon.h"
 
 #include <QtSensors/QCompass>
+#include <private/qeventdispatcher_winrt_p.h>
 
-QT_USE_NAMESPACE
-
+#include <functional>
 #include <wrl.h>
 #include <windows.devices.sensors.h>
 using namespace Microsoft::WRL;
@@ -133,20 +133,24 @@ WinRtCompass::WinRtCompass(QSensor *sensor)
     : QSensorBackend(sensor), d_ptr(new WinRtCompassPrivate(this))
 {
     Q_D(WinRtCompass);
-    HStringReference classId(RuntimeClass_Windows_Devices_Sensors_Compass);
-    ComPtr<ICompassStatics> factory;
-    HRESULT hr = RoGetActivationFactory(classId.Get(), IID_PPV_ARGS(&factory));
-    if (FAILED(hr)) {
-        qCWarning(lcWinRtSensors) << "Unable to initialize light sensor factory."
-                                  << qt_error_string(hr);
-        sensorError(hr);
-        return;
-    }
+    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+        HStringReference classId(RuntimeClass_Windows_Devices_Sensors_Compass);
+        ComPtr<ICompassStatics> factory;
+        HRESULT hr = RoGetActivationFactory(classId.Get(), IID_PPV_ARGS(&factory));
+        if (FAILED(hr)) {
+            qCWarning(lcWinRtSensors) << "Unable to initialize light sensor factory."
+                                      << qt_error_string(hr);
+            return hr;
+        }
 
-    hr = factory->GetDefault(&d->sensor);
+        hr = factory->GetDefault(&d->sensor);
+        if (FAILED(hr)) {
+            qCWarning(lcWinRtSensors) << "Unable to get default compass."
+                                      << qt_error_string(hr);
+        }
+        return hr;
+    });
     if (FAILED(hr) || !d->sensor) {
-        qCWarning(lcWinRtSensors) << "Unable to get default compass."
-                                  << qt_error_string(hr);
         sensorError(hr);
         return;
     }
@@ -177,9 +181,11 @@ void WinRtCompass::start()
     if (d->token.value)
         return;
 
-    ComPtr<CompassReadingHandler> callback =
+    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+        ComPtr<CompassReadingHandler> callback =
             Callback<CompassReadingHandler>(d, &WinRtCompassPrivate::readingChanged);
-    HRESULT hr = d->sensor->add_ReadingChanged(callback.Get(), &d->token);
+        return d->sensor->add_ReadingChanged(callback.Get(), &d->token);
+    });
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to attach to reading changed event."
                                   << qt_error_string(hr);
@@ -207,15 +213,16 @@ void WinRtCompass::stop()
         return;
     if (!d->token.value)
         return;
-
-    HRESULT hr = d->sensor->remove_ReadingChanged(d->token);
+    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+        return d->sensor->remove_ReadingChanged(d->token);
+    });
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to detach from reading changed event."
                                   << qt_error_string(hr);
         sensorError(hr);
         return;
     }
-    d->sensor->put_ReportInterval(0);
+    hr = d->sensor->put_ReportInterval(0);
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to reset report interval."
                                   << qt_error_string(hr);
diff --git a/src/plugins/sensors/winrt/winrtgyroscope.cpp b/src/plugins/sensors/winrt/winrtgyroscope.cpp
index e7910ab..70d7980 100644
--- a/src/plugins/sensors/winrt/winrtgyroscope.cpp
+++ b/src/plugins/sensors/winrt/winrtgyroscope.cpp
@@ -38,7 +38,9 @@
 #include "winrtcommon.h"
 
 #include <QtSensors/QGyroscope>
+#include <private/qeventdispatcher_winrt_p.h>
 
+#include <functional>
 #include <wrl.h>
 #include <windows.devices.sensors.h>
 using namespace Microsoft::WRL;
@@ -111,20 +113,24 @@ WinRtGyroscope::WinRtGyroscope(QSensor *sensor)
     : QSensorBackend(sensor), d_ptr(new WinRtGyroscopePrivate(this))
 {
     Q_D(WinRtGyroscope);
-    HStringReference classId(RuntimeClass_Windows_Devices_Sensors_Gyrometer);
-    ComPtr<IGyrometerStatics> factory;
-    HRESULT hr = RoGetActivationFactory(classId.Get(), IID_PPV_ARGS(&factory));
-    if (FAILED(hr)) {
-        qCWarning(lcWinRtSensors) << "Unable to initialize gyroscope sensor factory."
-                                  << qt_error_string(hr);
-        sensorError(hr);
-        return;
-    }
+    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+        HStringReference classId(RuntimeClass_Windows_Devices_Sensors_Gyrometer);
+        ComPtr<IGyrometerStatics> factory;
+        HRESULT hr = RoGetActivationFactory(classId.Get(), IID_PPV_ARGS(&factory));
+        if (FAILED(hr)) {
+            qCWarning(lcWinRtSensors) << "Unable to initialize gyroscope sensor factory."
+                                      << qt_error_string(hr);
+            return hr;
+        }
 
-    hr = factory->GetDefault(&d->sensor);
+        hr = factory->GetDefault(&d->sensor);
+        if (FAILED(hr)) {
+            qCWarning(lcWinRtSensors) << "Unable to get default gyroscope sensor."
+                                      << qt_error_string(hr);
+        }
+        return hr;
+    });
     if (FAILED(hr) || !d->sensor) {
-        qCWarning(lcWinRtSensors) << "Unable to get default gyroscope sensor."
-                                  << qt_error_string(hr);
         sensorError(hr);
         return;
     }
@@ -155,9 +161,11 @@ void WinRtGyroscope::start()
     if (d->token.value)
         return;
 
-    ComPtr<InclinometerReadingHandler> callback =
+    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+        ComPtr<InclinometerReadingHandler> callback =
             Callback<InclinometerReadingHandler>(d, &WinRtGyroscopePrivate::readingChanged);
-    HRESULT hr = d->sensor->add_ReadingChanged(callback.Get(), &d->token);
+        return d->sensor->add_ReadingChanged(callback.Get(), &d->token);
+    });
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to attach to reading changed event."
                                   << qt_error_string(hr);
@@ -186,14 +194,16 @@ void WinRtGyroscope::stop()
     if (!d->token.value)
         return;
 
-    HRESULT hr = d->sensor->remove_ReadingChanged(d->token);
+    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+        return d->sensor->remove_ReadingChanged(d->token);
+    });
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to detach from reading changed event."
                                   << qt_error_string(hr);
         sensorError(hr);
         return;
     }
-    d->sensor->put_ReportInterval(0);
+    hr = d->sensor->put_ReportInterval(0);
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to reset report interval."
                                   << qt_error_string(hr);
diff --git a/src/plugins/sensors/winrt/winrtorientationsensor.cpp b/src/plugins/sensors/winrt/winrtorientationsensor.cpp
index a40dbb9..c679d92 100644
--- a/src/plugins/sensors/winrt/winrtorientationsensor.cpp
+++ b/src/plugins/sensors/winrt/winrtorientationsensor.cpp
@@ -38,9 +38,9 @@
 #include "winrtcommon.h"
 
 #include <QtSensors/QOrientationSensor>
+#include <private/qeventdispatcher_winrt_p.h>
 
-QT_USE_NAMESPACE
-
+#include <functional>
 #include <wrl.h>
 #include <windows.devices.sensors.h>
 using namespace Microsoft::WRL;
@@ -119,20 +119,24 @@ WinRtOrientationSensor::WinRtOrientationSensor(QSensor *sensor)
     : QSensorBackend(sensor), d_ptr(new WinRtOrientationSensorPrivate(this))
 {
     Q_D(WinRtOrientationSensor);
-    HStringReference classId(RuntimeClass_Windows_Devices_Sensors_SimpleOrientationSensor);
-    ComPtr<ISimpleOrientationSensorStatics> factory;
-    HRESULT hr = RoGetActivationFactory(classId.Get(), IID_PPV_ARGS(&factory));
-    if (FAILED(hr)) {
-        qCWarning(lcWinRtSensors) << "Unable to initialize orientation sensor factory."
-                                  << qt_error_string(hr);
-        sensorError(hr);
-        return;
-    }
+    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+        HStringReference classId(RuntimeClass_Windows_Devices_Sensors_SimpleOrientationSensor);
+        ComPtr<ISimpleOrientationSensorStatics> factory;
+        HRESULT hr = RoGetActivationFactory(classId.Get(), IID_PPV_ARGS(&factory));
+        if (FAILED(hr)) {
+            qCWarning(lcWinRtSensors) << "Unable to initialize orientation sensor factory."
+                                      << qt_error_string(hr);
+            return hr;
+        }
 
-    hr = factory->GetDefault(&d->sensor);
+        hr = factory->GetDefault(&d->sensor);
+        if (FAILED(hr)) {
+            qCWarning(lcWinRtSensors) << "Unable to get default orientation sensor."
+                                      << qt_error_string(hr);
+        }
+        return hr;
+    });
     if (FAILED(hr) || !d->sensor) {
-        qCWarning(lcWinRtSensors) << "Unable to get default orientation sensor."
-                                  << qt_error_string(hr);
         sensorError(hr);
         return;
     }
@@ -152,9 +156,11 @@ void WinRtOrientationSensor::start()
     if (d->token.value)
         return;
 
-    ComPtr<SimpleOrientationReadingHandler> callback =
+    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+        ComPtr<SimpleOrientationReadingHandler> callback =
             Callback<SimpleOrientationReadingHandler>(d, &WinRtOrientationSensorPrivate::readingChanged);
-    HRESULT hr = d->sensor->add_OrientationChanged(callback.Get(), &d->token);
+        return d->sensor->add_OrientationChanged(callback.Get(), &d->token);
+    });
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to attach to reading changed event."
                                   << qt_error_string(hr);
@@ -171,7 +177,9 @@ void WinRtOrientationSensor::stop()
     if (!d->token.value)
         return;
 
-    HRESULT hr = d->sensor->remove_OrientationChanged(d->token);
+    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+        return d->sensor->remove_OrientationChanged(d->token);
+    });
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to detach from reading changed event."
                                   << qt_error_string(hr);
diff --git a/src/plugins/sensors/winrt/winrtrotationsensor.cpp b/src/plugins/sensors/winrt/winrtrotationsensor.cpp
index 93c19b0..570ef0b 100644
--- a/src/plugins/sensors/winrt/winrtrotationsensor.cpp
+++ b/src/plugins/sensors/winrt/winrtrotationsensor.cpp
@@ -38,7 +38,9 @@
 #include "winrtcommon.h"
 
 #include <QtSensors/QRotationSensor>
+#include <private/qeventdispatcher_winrt_p.h>
 
+#include <functional>
 #include <wrl.h>
 #include <windows.devices.sensors.h>
 using namespace Microsoft::WRL;
@@ -109,20 +111,24 @@ WinRtRotationSensor::WinRtRotationSensor(QSensor *sensor)
     : QSensorBackend(sensor), d_ptr(new WinRtRotationSensorPrivate(this))
 {
     Q_D(WinRtRotationSensor);
-    HStringReference classId(RuntimeClass_Windows_Devices_Sensors_Inclinometer);
-    ComPtr<IInclinometerStatics> factory;
-    HRESULT hr = RoGetActivationFactory(classId.Get(), IID_PPV_ARGS(&factory));
-    if (FAILED(hr)) {
-        qCWarning(lcWinRtSensors) << "Unable to initialize rotation sensor factory."
-                                  << qt_error_string(hr);
-        sensorError(hr);
-        return;
-    }
+    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+        HStringReference classId(RuntimeClass_Windows_Devices_Sensors_Inclinometer);
+        ComPtr<IInclinometerStatics> factory;
+        HRESULT hr = RoGetActivationFactory(classId.Get(), IID_PPV_ARGS(&factory));
+        if (FAILED(hr)) {
+            qCWarning(lcWinRtSensors) << "Unable to initialize rotation sensor factory."
+                                      << qt_error_string(hr);
+            return hr;
+        }
 
-    hr = factory->GetDefault(&d->sensor);
+        hr = factory->GetDefault(&d->sensor);
+        if (FAILED(hr)) {
+            qCWarning(lcWinRtSensors) << "Unable to get default rotation sensor."
+                                      << qt_error_string(hr);
+        }
+        return hr;
+    });
     if (FAILED(hr) || !d->sensor) {
-        qCWarning(lcWinRtSensors) << "Unable to get default rotation sensor."
-                                  << qt_error_string(hr);
         sensorError(hr);
         return;
     }
@@ -153,9 +159,11 @@ void WinRtRotationSensor::start()
     if (d->token.value)
         return;
 
-    ComPtr<InclinometerReadingHandler> callback =
+    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+        ComPtr<InclinometerReadingHandler> callback =
             Callback<InclinometerReadingHandler>(d, &WinRtRotationSensorPrivate::readingChanged);
-    HRESULT hr = d->sensor->add_ReadingChanged(callback.Get(), &d->token);
+        return d->sensor->add_ReadingChanged(callback.Get(), &d->token);
+    });
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to attach to reading changed event."
                                   << qt_error_string(hr);
@@ -184,14 +192,16 @@ void WinRtRotationSensor::stop()
     if (!d->token.value)
         return;
 
-    HRESULT hr = d->sensor->remove_ReadingChanged(d->token);
+    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+        return d->sensor->remove_ReadingChanged(d->token);
+    });
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to detach from reading changed event."
                                   << qt_error_string(hr);
         sensorError(hr);
         return;
     }
-    d->sensor->put_ReportInterval(0);
+    hr = d->sensor->put_ReportInterval(0);
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to reset report interval."
                                   << qt_error_string(hr);
diff --git a/src/sensors/doc/images/cubehouse.png b/src/sensors/doc/images/cubehouse.png
index e3ff7fa..dac833e 100644
--- a/src/sensors/doc/images/cubehouse.png
+++ b/src/sensors/doc/images/cubehouse.png
diff --git a/src/sensors/doc/src/compatmap.qdoc b/src/sensors/doc/src/compatmap.qdoc
index 4f45fcb..399bcec 100644
--- a/src/sensors/doc/src/compatmap.qdoc
+++ b/src/sensors/doc/src/compatmap.qdoc
@@ -85,7 +85,7 @@
     <td nowrap="nowrap">Ambient Light Sensor</td>
     <td bgcolor="gray"></td>
     <td bgcolor="gray"></td>
-    <td bgcolor="gray"></td>
+    <td bgcolor="green"></td>
     <td bgcolor="green"></td>
     <td bgcolor="gray"></td>
     <td bgcolor="green"></td>
@@ -103,7 +103,7 @@
     </tr>
     <tr>
     <td nowrap="nowrap">Compass</td>
-    <td bgcolor="gray"></td>
+    <td bgcolor="green"></td>
     <td bgcolor="green"></td>
     <td bgcolor="green"></td>
     <td bgcolor="green"></td>
@@ -175,7 +175,7 @@
     <td nowrap="nowrap">Orientation Sensor</td>
     <td bgcolor="gray"></td>
     <td bgcolor="green"></td>
-    <td bgcolor="gray"></td>
+    <td bgcolor="green"></td>
     <td bgcolor="green"></td>
     <td bgcolor="gray"></td>
     <td bgcolor="green"></td>
@@ -205,7 +205,7 @@
     <td nowrap="nowrap">Rotation Sensor</td>
     <td bgcolor="green"></td>
     <td bgcolor="gray"></td>
-    <td bgcolor="gray"></td>
+    <td bgcolor="green"></td>
     <td bgcolor="green"></td>
     <td bgcolor="green"></td>
     <td bgcolor="green"></td>
@@ -225,7 +225,7 @@
     <td nowrap="nowrap">Tilt Sensor</td>
     <td bgcolor="gray"></td>
     <td bgcolor="gray"></td>
-    <td bgcolor="gray"></td>
+    <td bgcolor="green"></td>
     <td bgcolor="gray"></td>
     <td bgcolor="gray"></td>
     <td bgcolor="green"></td>
diff --git a/src/sensors/gestures/qsensorgesture.h b/src/sensors/gestures/qsensorgesture.h
index 0132e31..880be69 100644
--- a/src/sensors/gestures/qsensorgesture.h
+++ b/src/sensors/gestures/qsensorgesture.h
@@ -58,7 +58,7 @@ class Q_SENSORS_EXPORT QSensorGesture : public QObject
 {
     //Do not use Q_OBJECT here
 public:
-    QSensorGesture(const QStringList &ids, QObject *parent = 0);
+    explicit QSensorGesture(const QStringList &ids, QObject *parent = Q_NULLPTR);
     ~QSensorGesture();
 
     bool isActive();
diff --git a/src/sensors/gestures/qsensorgesturemanager.h b/src/sensors/gestures/qsensorgesturemanager.h
index d9d7d6b..1ddc84c 100644
--- a/src/sensors/gestures/qsensorgesturemanager.h
+++ b/src/sensors/gestures/qsensorgesturemanager.h
@@ -55,7 +55,7 @@ class Q_SENSORS_EXPORT QSensorGestureManager : public QObject
     Q_DECLARE_PRIVATE(QSensorGestureManager)
 
 public:
-    explicit QSensorGestureManager(QObject *parent = 0);
+    explicit QSensorGestureManager(QObject *parent = Q_NULLPTR);
 
     ~QSensorGestureManager();
 
diff --git a/src/sensors/gestures/qsensorgesturerecognizer.h b/src/sensors/gestures/qsensorgesturerecognizer.h
index 1a58ac2..2718198 100644
--- a/src/sensors/gestures/qsensorgesturerecognizer.h
+++ b/src/sensors/gestures/qsensorgesturerecognizer.h
@@ -53,7 +53,7 @@ class Q_SENSORS_EXPORT QSensorGestureRecognizer : public QObject
 {
     Q_OBJECT
 public:
-    QSensorGestureRecognizer(QObject *parent = 0);
+    explicit QSensorGestureRecognizer(QObject *parent = Q_NULLPTR);
     virtual ~QSensorGestureRecognizer();
 
     virtual QString id() const = 0;
diff --git a/src/sensors/qaccelerometer.h b/src/sensors/qaccelerometer.h
index 24ccb34..1911e5f 100644
--- a/src/sensors/qaccelerometer.h
+++ b/src/sensors/qaccelerometer.h
@@ -81,7 +81,7 @@ class Q_SENSORS_EXPORT QAccelerometer : public QSensor
     Q_PROPERTY(AccelerationMode accelerationMode READ accelerationMode WRITE setAccelerationMode
                NOTIFY accelerationModeChanged)
 public:
-    explicit QAccelerometer(QObject *parent = 0);
+    explicit QAccelerometer(QObject *parent = Q_NULLPTR);
     virtual ~QAccelerometer();
 
     // Keep this enum in sync with QmlAccelerometer::AccelerationMode
diff --git a/src/sensors/qaltimeter.h b/src/sensors/qaltimeter.h
index 67fd617..0d609b4 100644
--- a/src/sensors/qaltimeter.h
+++ b/src/sensors/qaltimeter.h
@@ -67,7 +67,7 @@ class Q_SENSORS_EXPORT QAltimeter : public QSensor
 {
     Q_OBJECT
 public:
-    explicit QAltimeter(QObject *parent = 0);
+    explicit QAltimeter(QObject *parent = Q_NULLPTR);
     ~QAltimeter();
     QAltimeterReading *reading() const;
     static char const * const type;
diff --git a/src/sensors/qambientlightsensor.h b/src/sensors/qambientlightsensor.h
index 2e2bc4d..f9f7d1b 100644
--- a/src/sensors/qambientlightsensor.h
+++ b/src/sensors/qambientlightsensor.h
@@ -78,7 +78,7 @@ class Q_SENSORS_EXPORT QAmbientLightSensor : public QSensor
 {
     Q_OBJECT
 public:
-    explicit QAmbientLightSensor(QObject *parent = 0);
+    explicit QAmbientLightSensor(QObject *parent = Q_NULLPTR);
     virtual ~QAmbientLightSensor();
     QAmbientLightReading *reading() const;
     static char const * const type;
diff --git a/src/sensors/qambienttemperaturesensor.h b/src/sensors/qambienttemperaturesensor.h
index 534ff04..181c611 100644
--- a/src/sensors/qambienttemperaturesensor.h
+++ b/src/sensors/qambienttemperaturesensor.h
@@ -67,7 +67,7 @@ class Q_SENSORS_EXPORT QAmbientTemperatureSensor : public QSensor
 {
     Q_OBJECT
 public:
-    explicit QAmbientTemperatureSensor(QObject *parent = 0);
+    explicit QAmbientTemperatureSensor(QObject *parent = Q_NULLPTR);
     ~QAmbientTemperatureSensor();
     QAmbientTemperatureReading *reading() const;
     static char const * const type;
diff --git a/src/sensors/qcompass.cpp b/src/sensors/qcompass.cpp
index f6bea78..5177a17 100644
--- a/src/sensors/qcompass.cpp
+++ b/src/sensors/qcompass.cpp
@@ -56,7 +56,7 @@ IMPLEMENT_READING(QCompassReading)
     \section2 QCompassReading Units
     The compass returns the azimuth of the device as degrees from
     magnetic north in a clockwise direction based on the top of the device,
-    as defined by QPlatformScreen::nativeOrientation.
+    as defined by QScreen::nativeOrientation.
     There is also a value to indicate the calibration status of the device.
     If the device is not calibrated the azimuth may not be accurate.
 
@@ -67,7 +67,6 @@ IMPLEMENT_READING(QCompassReading)
     The calibration status of the device is measured as a number from 0 to 1.
     A value of 1 is the highest level that the device can support and 0 is
     the worst.
-    \sa {http://wiki.forum.nokia.com/index.php/CS001671_-_Calibrating_the_magnetometer_sensor}{CS001671 - Calibrating the magnetometer sensor}
 */
 
 /*!
@@ -99,7 +98,7 @@ void QCompassReading::setAzimuth(qreal azimuth)
     \brief the calibration level of the reading.
 
     Measured as a value from 0 to 1 with higher values being better.
-    \sa {QCompassReading Units}, {http://wiki.forum.nokia.com/index.php/CS001671_-_Calibrating_the_magnetometer_sensor}{CS001671 - Calibrating the magnetometer sensor}
+    \sa {QCompassReading Units}
 */
 
 qreal QCompassReading::calibrationLevel() const
diff --git a/src/sensors/qcompass.h b/src/sensors/qcompass.h
index a6ed41f..169f38c 100644
--- a/src/sensors/qcompass.h
+++ b/src/sensors/qcompass.h
@@ -72,7 +72,7 @@ class Q_SENSORS_EXPORT QCompass : public QSensor
 {
     Q_OBJECT
 public:
-    explicit QCompass(QObject *parent = 0);
+    explicit QCompass(QObject *parent = Q_NULLPTR);
     virtual ~QCompass();
     QCompassReading *reading() const;
     static char const * const type;
diff --git a/src/sensors/qdistancesensor.h b/src/sensors/qdistancesensor.h
index 6faeb4a..499a695 100644
--- a/src/sensors/qdistancesensor.h
+++ b/src/sensors/qdistancesensor.h
@@ -68,7 +68,7 @@ class Q_SENSORS_EXPORT QDistanceSensor : public QSensor
 {
     Q_OBJECT
 public:
-    explicit QDistanceSensor(QObject *parent = 0);
+    explicit QDistanceSensor(QObject *parent = Q_NULLPTR);
     ~QDistanceSensor();
     QDistanceReading *reading() const;
     static char const * const type;
diff --git a/src/sensors/qgyroscope.h b/src/sensors/qgyroscope.h
index 24fcde0..dc54179 100644
--- a/src/sensors/qgyroscope.h
+++ b/src/sensors/qgyroscope.h
@@ -76,7 +76,7 @@ class Q_SENSORS_EXPORT QGyroscope : public QSensor
 {
     Q_OBJECT
 public:
-    explicit QGyroscope(QObject *parent = 0);
+    explicit QGyroscope(QObject *parent = Q_NULLPTR);
     virtual ~QGyroscope();
     QGyroscopeReading *reading() const;
     static char const * const type;
diff --git a/src/sensors/qholstersensor.h b/src/sensors/qholstersensor.h
index 474f694..253e05b 100644
--- a/src/sensors/qholstersensor.h
+++ b/src/sensors/qholstersensor.h
@@ -67,7 +67,7 @@ class Q_SENSORS_EXPORT QHolsterSensor : public QSensor
 {
     Q_OBJECT
 public:
-    explicit QHolsterSensor(QObject *parent = 0);
+    explicit QHolsterSensor(QObject *parent = Q_NULLPTR);
     ~QHolsterSensor();
     QHolsterReading *reading() const;
     static char const * const type;
diff --git a/src/sensors/qirproximitysensor.h b/src/sensors/qirproximitysensor.h
index 8516399..153741c 100644
--- a/src/sensors/qirproximitysensor.h
+++ b/src/sensors/qirproximitysensor.h
@@ -68,7 +68,7 @@ class Q_SENSORS_EXPORT QIRProximitySensor : public QSensor
 {
     Q_OBJECT
 public:
-    explicit QIRProximitySensor(QObject *parent = 0);
+    explicit QIRProximitySensor(QObject *parent = Q_NULLPTR);
     virtual ~QIRProximitySensor();
     QIRProximityReading *reading() const;
     static char const * const type;
diff --git a/src/sensors/qlightsensor.h b/src/sensors/qlightsensor.h
index 9d30af6..0b16b46 100644
--- a/src/sensors/qlightsensor.h
+++ b/src/sensors/qlightsensor.h
@@ -71,7 +71,7 @@ class Q_SENSORS_EXPORT QLightSensor : public QSensor
     Q_OBJECT
     Q_PROPERTY(qreal fieldOfView READ fieldOfView NOTIFY fieldOfViewChanged)
 public:
-    explicit QLightSensor(QObject *parent = 0);
+    explicit QLightSensor(QObject *parent = Q_NULLPTR);
     virtual ~QLightSensor();
     QLightReading *reading() const;
     static char const * const type;
diff --git a/src/sensors/qmagnetometer.h b/src/sensors/qmagnetometer.h
index 585d09e..25ad040 100644
--- a/src/sensors/qmagnetometer.h
+++ b/src/sensors/qmagnetometer.h
@@ -83,7 +83,7 @@ class Q_SENSORS_EXPORT QMagnetometer : public QSensor
     Q_OBJECT
     Q_PROPERTY(bool returnGeoValues READ returnGeoValues WRITE setReturnGeoValues NOTIFY returnGeoValuesChanged)
 public:
-    explicit QMagnetometer(QObject *parent = 0);
+    explicit QMagnetometer(QObject *parent = Q_NULLPTR);
     virtual ~QMagnetometer();
     QMagnetometerReading *reading() const;
     static char const * const type;
diff --git a/src/sensors/qorientationsensor.h b/src/sensors/qorientationsensor.h
index 846092e..703abb3 100644
--- a/src/sensors/qorientationsensor.h
+++ b/src/sensors/qorientationsensor.h
@@ -79,7 +79,7 @@ class Q_SENSORS_EXPORT QOrientationSensor : public QSensor
 {
     Q_OBJECT
 public:
-    explicit QOrientationSensor(QObject *parent = 0);
+    explicit QOrientationSensor(QObject *parent = Q_NULLPTR);
     virtual ~QOrientationSensor();
     QOrientationReading *reading() const;
     static char const * const type;
diff --git a/src/sensors/qpressuresensor.h b/src/sensors/qpressuresensor.h
index 8426871..5deb16b 100644
--- a/src/sensors/qpressuresensor.h
+++ b/src/sensors/qpressuresensor.h
@@ -71,7 +71,7 @@ class Q_SENSORS_EXPORT QPressureSensor : public QSensor
 {
     Q_OBJECT
 public:
-    explicit QPressureSensor(QObject *parent = 0);
+    explicit QPressureSensor(QObject *parent = Q_NULLPTR);
     ~QPressureSensor();
     QPressureReading *reading() const;
     static char const * const type;
diff --git a/src/sensors/qproximitysensor.h b/src/sensors/qproximitysensor.h
index 1f3a3cf..33cd4b2 100644
--- a/src/sensors/qproximitysensor.h
+++ b/src/sensors/qproximitysensor.h
@@ -68,7 +68,7 @@ class Q_SENSORS_EXPORT QProximitySensor : public QSensor
 {
     Q_OBJECT
 public:
-    explicit QProximitySensor(QObject *parent = 0);
+    explicit QProximitySensor(QObject *parent = Q_NULLPTR);
     virtual ~QProximitySensor();
     QProximityReading *reading() const;
     static char const * const type;
diff --git a/src/sensors/qrotationsensor.h b/src/sensors/qrotationsensor.h
index a8148b2..de2053b 100644
--- a/src/sensors/qrotationsensor.h
+++ b/src/sensors/qrotationsensor.h
@@ -76,7 +76,7 @@ class Q_SENSORS_EXPORT QRotationSensor : public QSensor
     Q_OBJECT
     Q_PROPERTY(bool hasZ READ hasZ NOTIFY hasZChanged)
 public:
-    explicit QRotationSensor(QObject *parent = 0);
+    explicit QRotationSensor(QObject *parent = Q_NULLPTR);
     virtual ~QRotationSensor();
     QRotationReading *reading() const;
     static char const * const type;
diff --git a/src/sensors/qsensor.h b/src/sensors/qsensor.h
index a02cc27..cf8de76 100644
--- a/src/sensors/qsensor.h
+++ b/src/sensors/qsensor.h
@@ -116,7 +116,7 @@ public:
         UserOrientation
     };
 
-    explicit QSensor(const QByteArray &type, QObject *parent = 0);
+    explicit QSensor(const QByteArray &type, QObject *parent = Q_NULLPTR);
     virtual ~QSensor();
 
     QByteArray identifier() const;
@@ -207,7 +207,7 @@ Q_SIGNALS:
     void bufferSizeChanged(int bufferSize);
 
 protected:
-    explicit QSensor(const QByteArray &type, QSensorPrivate &dd, QObject* parent = 0);
+    explicit QSensor(const QByteArray &type, QSensorPrivate &dd, QObject* parent = Q_NULLPTR);
     QSensorBackend *backend() const;
 
 private:
@@ -261,7 +261,7 @@ private:
 
 #define DECLARE_READING_D(classname, pclassname)\
     public:\
-        classname(QObject *parent = 0);\
+        classname(QObject *parent = Q_NULLPTR);\
         virtual ~classname();\
         void copyValuesFrom(QSensorReading *other);\
     private:\
@@ -272,7 +272,7 @@ private:
 
 #define IMPLEMENT_READING_D(classname, pclassname)\
     classname::classname(QObject *parent)\
-        : QSensorReading(parent, 0)\
+        : QSensorReading(parent, Q_NULLPTR)\
         , d(new pclassname)\
         {}\
     classname::~classname() {}\
diff --git a/src/sensors/qsensorbackend.h b/src/sensors/qsensorbackend.h
index 14484f0..3837c14 100644
--- a/src/sensors/qsensorbackend.h
+++ b/src/sensors/qsensorbackend.h
@@ -51,7 +51,7 @@ class Q_SENSORS_EXPORT QSensorBackend : public QObject
 {
     Q_OBJECT
 public:
-    explicit QSensorBackend(QSensor *sensor, QObject *parent = 0);
+    explicit QSensorBackend(QSensor *sensor, QObject *parent = Q_NULLPTR);
     virtual ~QSensorBackend();
 
     virtual void start() = 0;
diff --git a/src/sensors/qtapsensor.h b/src/sensors/qtapsensor.h
index 082a030..d6207a1 100644
--- a/src/sensors/qtapsensor.h
+++ b/src/sensors/qtapsensor.h
@@ -93,7 +93,7 @@ class Q_SENSORS_EXPORT QTapSensor : public QSensor
     Q_PROPERTY(bool returnDoubleTapEvents READ returnDoubleTapEvents WRITE setReturnDoubleTapEvents
                NOTIFY returnDoubleTapEventsChanged)
 public:
-    explicit QTapSensor(QObject *parent = 0);
+    explicit QTapSensor(QObject *parent = Q_NULLPTR);
     virtual ~QTapSensor();
     QTapReading *reading() const;
     static char const * const type;
diff --git a/src/sensors/qtiltsensor.h b/src/sensors/qtiltsensor.h
index 6d25f3d..6f83a34 100644
--- a/src/sensors/qtiltsensor.h
+++ b/src/sensors/qtiltsensor.h
@@ -74,7 +74,7 @@ class Q_SENSORS_EXPORT QTiltSensor : public QSensor
 {
     Q_OBJECT
 public:
-    explicit QTiltSensor(QObject *parent = 0);
+    explicit QTiltSensor(QObject *parent = Q_NULLPTR);
     ~QTiltSensor();
     QTiltReading *reading() const;
     static char const * const type;
diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro
index a7f60e1..9eeceb8 100644
--- a/src/sensors/sensors.pro
+++ b/src/sensors/sensors.pro
@@ -7,7 +7,7 @@ CONFIG(debug,debug|release):DEFINES += ENABLE_RUNTIME_SENSORLOG
 
 qtHaveModule(simulator) {
     DEFINES += SIMULATOR_BUILD
-    QT += simulator
+    QT_FOR_PRIVATE += simulator
 }
 
 QMAKE_DOCS = $$PWD/doc/qtsensors.qdocconf
@@ -18,11 +18,6 @@ ANDROID_JAR_DEPENDENCIES = \
     jar/QtSensors.jar:org.qtproject.qt5.android.sensors.QtSensors
 ANDROID_LIB_DEPENDENCIES = \
     plugins/sensors/libqtsensors_android.so
-MODULE_PLUGIN_TYPES = \
-    sensors \
-    sensorgestures
-
-load(qt_module)
 
 PUBLIC_HEADERS += \
            qsensorbackend.h\
@@ -87,3 +82,8 @@ for(s,SENSORS) {
 }
 
 HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS $$GESTURE_HEADERS
+
+MODULE_PLUGIN_TYPES = \
+    sensors \
+    sensorgestures
+load(qt_module)
diff --git a/tests/auto/qsensorgestures/plugins/test1/test1.pro b/tests/auto/qsensorgestures/plugins/test1/test1.pro
index f35af0d..5f89068 100644
--- a/tests/auto/qsensorgestures/plugins/test1/test1.pro
+++ b/tests/auto/qsensorgestures/plugins/test1/test1.pro
@@ -2,11 +2,6 @@ TARGET  = qtsensorgestures_testplugin1
 
 QT += sensors   sensorgestures
 
-PLUGIN_TYPE = sensorgestures
-PLUGIN_CLASS_NAME = QTestSensorGestureDupPlugin
-PLUGIN_EXTENDS = -
-load(qt_plugin)
-
 # Input
 HEADERS +=  qtestsensorgestureplugindup_p.h \
                   qtestrecognizerdup.h \
@@ -16,3 +11,8 @@ SOURCES += qtestsensorgestureplugindup.cpp \
                   qtest2recognizerduo.cpp
 
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = sensorgestures
+PLUGIN_CLASS_NAME = QTestSensorGestureDupPlugin
+PLUGIN_EXTENDS = -
+load(qt_plugin)