summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-02-19 16:09:02 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-02-19 19:27:43 +0100
commit5cf1a2f7f4ac4e71b085ef53ff5a05c4676f7ce2 (patch)
treeeff94d6fba0053177b0f6dac2e93b9ce27cbf294
parent5e8d2b4e266916761a26905f0930add305c308cf (diff)
parentfbaca62cd0a7309f04bf82101c8e20dbbf423192 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts: .qmake.conf src/sensors/doc/src/compatmap.qdoc Change-Id: I4049bc3c335a8a9db5c935032207d0bcfba78480
-rw-r--r--examples/sensors/qmlqtsensors/qmlqtsensors.qml18
-rw-r--r--src/imports/sensors/plugins.qmltypes2
-rw-r--r--src/imports/sensors/qmlrotationsensor.h2
-rw-r--r--src/plugins/sensors/generic/generictiltsensor.h3
-rw-r--r--src/plugins/sensors/winrt/winrt.pro2
-rw-r--r--src/plugins/sensors/winrt/winrtaccelerometer.cpp42
-rw-r--r--src/plugins/sensors/winrt/winrtambientlightsensor.cpp42
-rw-r--r--src/plugins/sensors/winrt/winrtcompass.cpp45
-rw-r--r--src/plugins/sensors/winrt/winrtgyroscope.cpp42
-rw-r--r--src/plugins/sensors/winrt/winrtorientationsensor.cpp42
-rw-r--r--src/plugins/sensors/winrt/winrtrotationsensor.cpp42
-rw-r--r--src/sensors/doc/src/compatmap.qdoc2
-rw-r--r--src/sensors/qcompass.cpp1
13 files changed, 170 insertions, 115 deletions
diff --git a/examples/sensors/qmlqtsensors/qmlqtsensors.qml b/examples/sensors/qmlqtsensors/qmlqtsensors.qml
index bc456be5..40492c71 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/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes
index 746230ba..2c72e1ff 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 66da0b7a..0c79c3dd 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/sensors/generic/generictiltsensor.h b/src/plugins/sensors/generic/generictiltsensor.h
index 52c5f7c3..9562acaf 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/winrt/winrt.pro b/src/plugins/sensors/winrt/winrt.pro
index 4a03bf2e..67ae5304 100644
--- a/src/plugins/sensors/winrt/winrt.pro
+++ b/src/plugins/sensors/winrt/winrt.pro
@@ -1,5 +1,5 @@
TARGET = qtsensors_winrt
-QT = sensors core
+QT = sensors core core_private
PLUGIN_TYPE = sensors
PLUGIN_CLASS_NAME = WinRtSensorPlugin
diff --git a/src/plugins/sensors/winrt/winrtaccelerometer.cpp b/src/plugins/sensors/winrt/winrtaccelerometer.cpp
index f2728a86..fba9594c 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 b1e1c52c..d0d7fd7d 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 9c57db9d..22f4ac5b 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 e7910ab2..70d7980f 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 a40dbb9d..c679d925 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 93c19b0a..570ef0bb 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/src/compatmap.qdoc b/src/sensors/doc/src/compatmap.qdoc
index 4f45fcbc..f043195c 100644
--- a/src/sensors/doc/src/compatmap.qdoc
+++ b/src/sensors/doc/src/compatmap.qdoc
@@ -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>
diff --git a/src/sensors/qcompass.cpp b/src/sensors/qcompass.cpp
index f6bea78c..d9527754 100644
--- a/src/sensors/qcompass.cpp
+++ b/src/sensors/qcompass.cpp
@@ -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}
*/
/*!