From 5a8aa096dc61336ac95734e8cc61f106e359c865 Mon Sep 17 00:00:00 2001
From: Juha Vuolle <juha.vuolle@insta.fi>
Date: Tue, 5 Jan 2021 14:27:16 +0200
Subject: Base commit to make QtSensors runnable on Windows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fair amount of work remains after the commit still, but this should
allow further development as a compilable baseline: code compiles,
autotests pass, and most example applications at least start.

The changes:
-Change examples to use QtQuickControls 2 as per removal of v1
-Fix ambiguous conditional expression compilation error
-Link against runtimeobject library (previously part of winrt QPA?)
-Change the .pro file rule to win32 as winrt moniker does not exist anymore
-Remove references to deleted winrt event dispatcher
-Fix error handling: getdefault may be successful even if there is no default sensor
-Fix QCOMPARE failure output (toString has changed in Qt6)
-Remove qtimestamp alias which was deprecated already in Qt5
-Remove unit test hook that does not seem to be used anywhere
-From typedef to ‘using’ for readability
-Q_ENUMS -> Q_ENUM as the former has been obsoleted by the latter
-Add qt6 changes qdoc page

Task-number: QTBUG-88616
Change-Id: I92c168228ba76106b2c636c88f54331c76c3d2e6
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
---
 .../sensors/winrt/winrtambientlightsensor.cpp      | 44 ++++++++++------------
 1 file changed, 20 insertions(+), 24 deletions(-)

(limited to 'src/plugins/sensors/winrt/winrtambientlightsensor.cpp')

diff --git a/src/plugins/sensors/winrt/winrtambientlightsensor.cpp b/src/plugins/sensors/winrt/winrtambientlightsensor.cpp
index 426d61bf..7832eb1c 100644
--- a/src/plugins/sensors/winrt/winrtambientlightsensor.cpp
+++ b/src/plugins/sensors/winrt/winrtambientlightsensor.cpp
@@ -41,7 +41,6 @@
 #include "winrtcommon.h"
 
 #include <QtSensors/QAmbientLightSensor>
-#include <private/qeventdispatcher_winrt_p.h>
 
 #include <functional>
 #include <wrl.h>
@@ -118,27 +117,27 @@ WinRtAmbientLightSensor::WinRtAmbientLightSensor(QSensor *sensor)
     : QSensorBackend(sensor), d_ptr(new WinRtAmbientLightSensorPrivate(this))
 {
     Q_D(WinRtAmbientLightSensor);
-    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);
-        if (FAILED(hr)) {
-            qCWarning(lcWinRtSensors) << "Unable to get default light sensor."
+    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;
-    });
-    if (FAILED(hr) || !d->sensor) {
         sensorError(hr);
         return;
     }
+    hr = factory->GetDefault(&d->sensor);
+    if (FAILED(hr)) {
+        qCWarning(lcWinRtSensors) << "Unable to get default light sensor."
+                                      << qt_error_string(hr);
+        sensorError(hr);
+        return;
+    }
+    if (!d->sensor) {
+        qCWarning(lcWinRtSensors) << "Default lightsensor was not found on the system.";
+        return;
+    }
 
     hr = d->sensor->get_MinimumReportInterval(&d->minimumReportInterval);
     if (FAILED(hr)) {
@@ -166,11 +165,10 @@ void WinRtAmbientLightSensor::start()
     if (d->token.value)
         return;
 
-    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
-        ComPtr<LightSensorReadingHandler> callback =
+    ComPtr<LightSensorReadingHandler> callback =
             Callback<LightSensorReadingHandler>(d, &WinRtAmbientLightSensorPrivate::readingChanged);
-        return d->sensor->add_ReadingChanged(callback.Get(), &d->token);
-    });
+    HRESULT hr = d->sensor->add_ReadingChanged(callback.Get(), &d->token);
+
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to attach to reading changed event."
                                   << qt_error_string(hr);
@@ -199,9 +197,7 @@ void WinRtAmbientLightSensor::stop()
     if (!d->token.value)
         return;
 
-    HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
-        return d->sensor->remove_ReadingChanged(d->token);
-    });
+    HRESULT hr = d->sensor->remove_ReadingChanged(d->token);
     if (FAILED(hr)) {
         qCWarning(lcWinRtSensors) << "Unable to detach from reading changed event."
                                   << qt_error_string(hr);
-- 
cgit v1.2.3