1 files changed, 19 insertions, 24 deletions

diff --git a/src/plugins/sensors/winrt/winrtorientationsensor.cpp b/src/plugins/sensors/winrt/winrtorientationsensor.cpp
index e24ff954..1511a308 100644
--- a/src/plugins/sensors/winrt/winrtorientationsensor.cpp
+++ b/src/plugins/sensors/winrt/winrtorientationsensor.cpp
@@ -41,7 +41,6 @@
 #include "winrtcommon.h"
 
 #include <QtSensors/QOrientationSensor>
-#include <private/qeventdispatcher_winrt_p.h>
 
 #include <functional>
 #include <wrl.h>
@@ -122,27 +121,26 @@ WinRtOrientationSensor::WinRtOrientationSensor(QSensor *sensor)
     : QSensorBackend(sensor), d_ptr(new WinRtOrientationSensorPrivate(this))
 {
     Q_D(WinRtOrientationSensor);
-    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."
+    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);
-        if (FAILED(hr)) {
-            qCWarning(lcWinRtSensors) << "Unable to get default orientation sensor."
+        sensorError(hr);
+        return;
+    }
+    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) {
         sensorError(hr);
         return;
     }
+    if (!d->sensor) {
+        qCWarning(lcWinRtSensors) << "Default orientationsensor was not found on the system.";
+        return;
+    }
 
     setReading<QOrientationReading>(&d->reading);
 }
@@ -159,11 +157,10 @@ void WinRtOrientationSensor::start()
     if (d->token.value)
         return;
 
-    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
-        ComPtr<SimpleOrientationReadingHandler> callback =
+    ComPtr<SimpleOrientationReadingHandler> callback =
             Callback<SimpleOrientationReadingHandler>(d, &WinRtOrientationSensorPrivate::readingChanged);
-        return d->sensor->add_OrientationChanged(callback.Get(), &d->token);
-    });
+    HRESULT hr = d->sensor->add_OrientationChanged(callback.Get(), &d->token);
+
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to attach to reading changed event."
                                   << qt_error_string(hr);
@@ -180,9 +177,7 @@ void WinRtOrientationSensor::stop()
     if (!d->token.value)
         return;
 
-    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
-        return d->sensor->remove_OrientationChanged(d->token);
-    });
+    HRESULT hr = d->sensor->remove_OrientationChanged(d->token);
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to detach from reading changed event."
                                   << qt_error_string(hr);