diff options
| author | Juha Vuolle <juha.vuolle@insta.fi> | 2021-01-05 14:27:16 +0200 |
|---|---|---|
| committer | Juha Vuolle <juha.vuolle@insta.fi> | 2021-04-19 13:29:44 +0300 |
| commit | 5a8aa096dc61336ac95734e8cc61f106e359c865 (patch) | |
| tree | 20b1c3f3932b48bb6020a3d40d0dacf1abc6be2d /examples/sensors/sensor_explorer | |
| parent | 7dbb79c428f813e32986ccfe09a42f7d61a4c005 (diff) | |
Base commit to make QtSensors runnable on Windows
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>
Diffstat (limited to 'examples/sensors/sensor_explorer')
| -rw-r--r-- | examples/sensors/sensor_explorer/import/sensoritem.cpp | 2 | ||||
| -rw-r--r-- | examples/sensors/sensor_explorer/sensor_explorer.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/sensors/sensor_explorer/import/sensoritem.cpp b/examples/sensors/sensor_explorer/import/sensoritem.cpp index f268db3a..40fb847e 100644 --- a/examples/sensors/sensor_explorer/import/sensoritem.cpp +++ b/examples/sensors/sensor_explorer/import/sensoritem.cpp @@ -110,7 +110,7 @@ void QSensorItem::setStart(bool run) */ QString QSensorItem::id() { - return (_qsensor ? _qsensor->identifier() : ""); + return (_qsensor ? _qsensor->identifier() : QStringLiteral("")); } /* diff --git a/examples/sensors/sensor_explorer/sensor_explorer.qml b/examples/sensors/sensor_explorer/sensor_explorer.qml index 365842d9..24e22133 100644 --- a/examples/sensors/sensor_explorer/sensor_explorer.qml +++ b/examples/sensors/sensor_explorer/sensor_explorer.qml @@ -50,7 +50,7 @@ import QtQuick 2.1 import QtQuick.Window 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 2.0 //! [0] import Explorer 1.0 |