Update QtSensors platform- and sensor support in Qt6

This commit removes the sensor frontend implementations of QAltimeter,
QDistanceSensor, QHolsterSensor and their QML counterparts. Since
the BlackBerry backend removal in 2015 these sensors have not had
a backend support.

Sensorfw is not currently supported by Qt6, and as the sole backend
provider the following sensors have been removed from documentation
until such support is reintroduced: QIRProximitySensor, QLidSensor,
QTapSensor and their QML counterparts.

[ChangeLog][QAltimeter] Remove support
[ChangeLog][QDistanceSensor] Remove support
[ChangeLog][QHolsterSensor] Remove support
[ChangeLog][QIRProximitySensor] Disable documentation
[ChangeLog][QLidSensor] Disable documentation
[ChangeLog][QTapSensor] Disable documentation

Task-number: QTBUG-92512
Change-Id: Ic89e91bf65e7a70a2faf0fb566bb24f2f1005a4e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit d40c4d0b3766043cf4fbaa87acd76b11bf733369)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

5 files changed, 0 insertions, 47 deletions

diff --git a/tests/auto/common/test_backends.cpp b/tests/auto/common/test_backends.cpp
index a8ce7f3f..cbdda60c 100644
--- a/tests/auto/common/test_backends.cpp
+++ b/tests/auto/common/test_backends.cpp
@@ -104,10 +104,6 @@ void set_test_backend_reading(QSensor* sensor, const QVariantMap& values)
         QOrientationReading* reading = static_cast<QOrientationReading*>(backend->reading());
         reading->setOrientation(QOrientationReading::Orientation(values["orientation"].toInt()));
         backend->newReadingAvailable();
-    } else if (sensor->type() == "QDistanceSensor") {
-        QDistanceReading* reading = static_cast<QDistanceReading*>(backend->reading());
-        reading->setDistance(values["distance"].value<qreal>());
-        backend->newReadingAvailable();
     } else if (sensor->type() == "QAmbientLightSensor") {
         QAmbientLightReading* reading = static_cast<QAmbientLightReading*>(backend->reading());
         reading->setLightLevel(QAmbientLightReading::LightLevel(values["lightLevel"].toInt()));
@@ -138,10 +134,6 @@ void set_test_backend_reading(QSensor* sensor, const QVariantMap& values)
         if (values.contains("relativeHumidity")) reading->setRelativeHumidity(values["relativeHumidity"].value<qreal>());
         if (values.contains("absoluteHumidity")) reading->setAbsoluteHumidity(values["absoluteHumidity"].value<qreal>());
         backend->newReadingAvailable();
-    } else if (sensor->type() == "QHolsterSensor") {
-        QHolsterReading* reading = static_cast<QHolsterReading*>(backend->reading());
-        reading->setHolstered(values["holstered"].value<bool>());
-        backend->newReadingAvailable();
     } else if (sensor->type() == "QAmbientTemperatureSensor") {
         QAmbientTemperatureReading* reading = static_cast<QAmbientTemperatureReading*>(backend->reading());
         reading->setTemperature(values["temperature"].value<qreal>());
@@ -150,10 +142,6 @@ void set_test_backend_reading(QSensor* sensor, const QVariantMap& values)
         QLightReading* reading = static_cast<QLightReading*>(backend->reading());
         reading->setLux(values["illuminance"].value<qreal>());
         backend->newReadingAvailable();
-    } else if (sensor->type() == "QAltimeter") {
-        QAltimeterReading* reading = static_cast<QAltimeterReading*>(backend->reading());
-        reading->setAltitude(values["altitude"].value<qreal>());
-        backend->newReadingAvailable();
     } else if (sensor->type() == "QIRProximitySensor") {
         QIRProximityReading* reading = static_cast<QIRProximityReading*>(backend->reading());
         reading->setReflectance(values["reflectance"].value<qreal>());
diff --git a/tests/auto/common/test_backends.h b/tests/auto/common/test_backends.h
index 80d6913c..1e6cd09b 100644
--- a/tests/auto/common/test_backends.h
+++ b/tests/auto/common/test_backends.h
@@ -38,12 +38,10 @@ void set_test_backend_reading(QSensor* sensor, const QVariantMap& values);
 void set_test_backend_busy(QSensor* sensor, bool busy);
 
 #include <qaccelerometer.h>
-#include <qaltimeter.h>
 #include <qambientlightsensor.h>
 #include <qambienttemperaturesensor.h>
 #include <qcompass.h>
 #include <qgyroscope.h>
-#include <qholstersensor.h>
 #include <qlightsensor.h>
 #include <qmagnetometer.h>
 #include <qorientationsensor.h>
@@ -53,7 +51,6 @@ void set_test_backend_busy(QSensor* sensor, bool busy);
 #include <qtapsensor.h>
 #include <qirproximitysensor.h>
 #include <qtiltsensor.h>
-#include <qdistancesensor.h>
 #include <qlidsensor.h>
 #include <qhumiditysensor.h>
 
@@ -94,9 +91,6 @@ PREPARE_SENSORINTERFACE(QAccelerometer, QAccelerometerReading, QAccelerometerFil
     reading->setY(1.0);
     reading->setZ(1.0);
 })
-PREPARE_SENSORINTERFACE(QAltimeter, QAltimeterReading, QAltimeterFilter, {
-    reading->setAltitude(8848);
-})
 PREPARE_SENSORINTERFACE(QAmbientLightSensor, QAmbientLightReading, QAmbientLightFilter, {
     reading->setLightLevel(QAmbientLightReading::Twilight);
 })
@@ -112,9 +106,6 @@ PREPARE_SENSORINTERFACE(QGyroscope, QGyroscopeReading, QGyroscopeFilter, {
     reading->setY(1.0);
     reading->setZ(1.0);
 })
-PREPARE_SENSORINTERFACE(QHolsterSensor, QHolsterReading, QHolsterFilter, {
-    reading->setHolstered(true);
-})
 PREPARE_SENSORINTERFACE(QLightSensor, QLightReading, QLightFilter, {
     reading->setLux(1.0);
 })
@@ -148,9 +139,6 @@ PREPARE_SENSORINTERFACE(QTiltSensor, QTiltReading, QTiltFilter, {
     reading->setYRotation(1.0);
     reading->setXRotation(1.0);
 })
-PREPARE_SENSORINTERFACE(QDistanceSensor, QDistanceReading, QDistanceFilter, {
-    reading->setDistance(1.0);
-})
 PREPARE_SENSORINTERFACE(QLidSensor, QLidReading, QLidFilter, {
     reading->setBackLidClosed(true);
     reading->setFrontLidClosed(true);
diff --git a/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp b/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp
index d266649f..57cd0cb1 100644
--- a/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp
+++ b/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp
@@ -48,17 +48,14 @@
 #include <QtSensorsQuick/private/qmlcompass_p.h>
 #include <QtSensorsQuick/private/qmlproximitysensor_p.h>
 #include <QtSensorsQuick/private/qmlorientationsensor_p.h>
-#include <QtSensorsQuick/private/qmldistancesensor_p.h>
 #include <QtSensorsQuick/private/qmlambientlightsensor_p.h>
 #include <QtSensorsQuick/private/qmlmagnetometer_p.h>
 #include <QtSensorsQuick/private/qmllidsensor_p.h>
 #include <QtSensorsQuick/private/qmltiltsensor_p.h>
 #include <QtSensorsQuick/private/qmlrotationsensor_p.h>
 #include <QtSensorsQuick/private/qmlhumiditysensor_p.h>
-#include <QtSensorsQuick/private/qmlholstersensor_p.h>
 #include <QtSensorsQuick/private/qmlambienttemperaturesensor_p.h>
 #include <QtSensorsQuick/private/qmllightsensor_p.h>
-#include <QtSensorsQuick/private/qmlaltimeter_p.h>
 #include <QtSensorsQuick/private/qmlirproximitysensor_p.h>
 
 QT_USE_NAMESPACE
@@ -143,9 +140,6 @@ void tst_sensors_qmlcpp::testReadingBindings()
     testSensorReadings<QmlOrientationSensor, QmlOrientationSensorReading, QOrientationReading::Orientation>(
                 "QOrientationSensor",
                 {{"orientation", QVariantList{QOrientationReading::LeftUp, QOrientationReading::RightUp}}});
-    testSensorReadings<QmlDistanceSensor, QmlDistanceReading, qreal>(
-                "QDistanceSensor",
-                {{"distance", QVariantList{1.0, 2.0}}});
     testSensorReadings<QmlMagnetometer, QmlMagnetometerReading, qreal>(
                 "QMagnetometer",
                 {{"x", QVariantList{1.0, 2.0}},
@@ -175,18 +169,12 @@ void tst_sensors_qmlcpp::testReadingBindings()
                 "QHumiditySensor",
                 {{"relativeHumidity", QVariantList{1.0, 2.0}},
                  {"absoluteHumidity", QVariantList{1.0, 2.0}}});
-    testSensorReadings<QmlHolsterSensor, QmlHolsterReading, bool>(
-                "QHolsterSensor",
-                {{"holstered", QVariantList{true, false}}});
     testSensorReadings<QmlAmbientTemperatureSensor, QmlAmbientTemperatureReading, qreal>(
                 "QAmbientTemperatureSensor",
                 {{"temperature", QVariantList{30.0, 40.0}}});
     testSensorReadings<QmlLightSensor, QmlLightSensorReading, qreal>(
                 "QLightSensor",
                 {{"illuminance", QVariantList{1.0, 2.0}}});
-    testSensorReadings<QmlAltimeter, QmlAltimeterReading, qreal>(
-                "QAltimeter",
-                {{"altitude", QVariantList{8848, 9959}}});
     testSensorReadings<QmlIRProximitySensor, QmlIRProximitySensorReading, qreal>(
                 "QIRProximitySensor",
                 {{"reflectance", QVariantList{0.5, 0.6}}});
diff --git a/tests/auto/qml/qml_quick/tst_sensors_basic.qml b/tests/auto/qml/qml_quick/tst_sensors_basic.qml
index f6553df4..b5cab08b 100644
--- a/tests/auto/qml/qml_quick/tst_sensors_basic.qml
+++ b/tests/auto/qml/qml_quick/tst_sensors_basic.qml
@@ -215,17 +215,14 @@ TestCase {
                     {tag: "Compass", initialReading: {azimuth: 1.0, calibrationLevel: 1.0}, newReading: {azimuth: 2.0, calibrationLevel: 3.0}},
                     {tag: "ProximitySensor", initialReading: {near: true}, newReading: {near: false}},
                     {tag: "OrientationSensor", initialReading: {orientation: OrientationReading.LeftUp}, newReading: {orientation: OrientationReading.RightUp}},
-                    {tag: "DistanceSensor", initialReading: {distance: 1.0}, newReading: {distance: 2.0}},
                     {tag: "AmbientLightSensor", initialReading: {lightLevel: AmbientLightReading.Twilight}, newReading: {lightLevel: AmbientLightReading.Sunny}},
                     {tag: "Magnetometer", initialReading: {x : 1.0, y: 1.0, z: 1.0, calibrationLevel: 1.0}, newReading:  {x : 2.0, y: 3.0, z: 4.0, calibrationLevel: 5.0}},
                     {tag: "LidSensor", initialReading: {backLidClosed:true, frontLidClosed: true}, newReading:  {backLidClosed:false, frontLidClosed: false}},
                     {tag: "TiltSensor", initialReading: {yRotation: 1.0, xRotation: 1.0}, newReading: {yRotation: 2.0, xRotation: 3.0}},
                     {tag: "RotationSensor", initialReading: {x: 1.0, y: 1.0, z: 1.0}, newReading: {x: 2.0, y: 3.0, z: 4.0}},
                     {tag: "HumiditySensor", initialReading: {relativeHumidity: 1.0, absoluteHumidity: 1.0}, newReading: {relativeHumidity: 2.0, absoluteHumidity: 3.0}},
-                    {tag: "HolsterSensor", initialReading: {holstered: true}, newReading: {holstered: false}},
                     {tag: "AmbientTemperatureSensor", initialReading: {temperature: 30.0}, newReading: {temperature: 40.0}},
                     {tag: "LightSensor", initialReading: {illuminance: 1.0}, newReading: {illuminance: 2.0}},
-                    {tag: "Altimeter", initialReading: {altitude: 8848}, newReading: {altitude: 9959}},
                     {tag: "IRProximitySensor", initialReading: {reflectance: 0.5}, newReading: {reflectance: 0.6}}
                ];
     }
diff --git a/tests/auto/qsensor/tst_qsensor.cpp b/tests/auto/qsensor/tst_qsensor.cpp
index 69c5c5f1..6c74ba3d 100644
--- a/tests/auto/qsensor/tst_qsensor.cpp
+++ b/tests/auto/qsensor/tst_qsensor.cpp
@@ -816,10 +816,6 @@ private slots:
             QCOMPARE(reading->z(), 1.0);
         })
 
-        TEST_SENSORINTERFACE(QAltimeter, QAltimeterReading, {
-            QCOMPARE(reading->altitude(), 8848.0);
-        })
-
         TEST_SENSORINTERFACE(QAmbientLightSensor, QAmbientLightReading, {
             QCOMPARE(reading->lightLevel(), QAmbientLightReading::Twilight);
         })
@@ -839,10 +835,6 @@ private slots:
             QCOMPARE(reading->z(), 1.0);
         })
 
-        TEST_SENSORINTERFACE(QHolsterSensor, QHolsterReading, {
-            QCOMPARE(reading->holstered(), true);
-        })
-
         TEST_SENSORINTERFACE(QLightSensor, QLightReading, {
             QCOMPARE(reading->lux(), 1.0);
         })