summaryrefslogtreecommitdiffstats
path: root/src/sensorsquick
diff options
context:
space:
mode:
authorJuha Vuolle <juha.vuolle@insta.fi>2021-06-22 16:20:43 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-06-29 08:46:48 +0000
commitcf9bde07bf104459f433e18f1ef1e75cd66fcf1f (patch)
tree43449164364bcee9c8f90e24ff256080e185005f /src/sensorsquick
parentcb4adddcd0e322c527b307dbf6e353fcf1d69a6a (diff)
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>
Diffstat (limited to 'src/sensorsquick')
-rw-r--r--src/sensorsquick/CMakeLists.txt3
-rw-r--r--src/sensorsquick/qmlaltimeter.cpp130
-rw-r--r--src/sensorsquick/qmlaltimeter_p.h103
-rw-r--r--src/sensorsquick/qmldistancesensor.cpp132
-rw-r--r--src/sensorsquick/qmldistancesensor_p.h104
-rw-r--r--src/sensorsquick/qmlholstersensor.cpp131
-rw-r--r--src/sensorsquick/qmlholstersensor_p.h104
-rw-r--r--src/sensorsquick/qmlirproximitysensor.cpp2
-rw-r--r--src/sensorsquick/qmllidsensor.cpp2
-rw-r--r--src/sensorsquick/qmltapsensor.cpp2
10 files changed, 6 insertions, 707 deletions
diff --git a/src/sensorsquick/CMakeLists.txt b/src/sensorsquick/CMakeLists.txt
index 87a951a5..04a2bc2f 100644
--- a/src/sensorsquick/CMakeLists.txt
+++ b/src/sensorsquick/CMakeLists.txt
@@ -3,13 +3,10 @@ qt_internal_add_qml_module(SensorsQuick
VERSION "${PROJECT_VERSION}"
SOURCES
qmlaccelerometer.cpp qmlaccelerometer_p.h
- qmlaltimeter.cpp qmlaltimeter_p.h
qmlambientlightsensor.cpp qmlambientlightsensor_p.h
qmlambienttemperaturesensor.cpp qmlambienttemperaturesensor_p.h
qmlcompass.cpp qmlcompass_p.h
- qmldistancesensor.cpp qmldistancesensor_p.h
qmlgyroscope.cpp qmlgyroscope_p.h
- qmlholstersensor.cpp qmlholstersensor_p.h
qmlhumiditysensor.cpp qmlhumiditysensor_p.h
qmlirproximitysensor.cpp qmlirproximitysensor_p.h
qmllidsensor.cpp qmllidsensor_p.h
diff --git a/src/sensorsquick/qmlaltimeter.cpp b/src/sensorsquick/qmlaltimeter.cpp
deleted file mode 100644
index 2c80c365..00000000
--- a/src/sensorsquick/qmlaltimeter.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Research In Motion
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtSensors module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "qmlaltimeter_p.h"
-#include <QtSensors/QAltimeter>
-
-/*!
- \qmltype Altimeter
- \instantiates QmlAltimeter
- \ingroup qml-sensors_type
- \inqmlmodule QtSensors
- \since QtSensors 5.1
- \inherits Sensor
- \brief The Altimeter element reports on altitude.
-
- The Altimeter element reports on altitude.
-
- This element wraps the QAltimeter class. Please see the documentation for
- QAltimeter for details.
-
- \sa AltimeterReading
-*/
-
-QmlAltimeter::QmlAltimeter(QObject *parent)
- : QmlSensor(parent)
- , m_sensor(new QAltimeter(this))
-{
-}
-
-QmlAltimeter::~QmlAltimeter()
-{
-}
-
-QmlSensorReading *QmlAltimeter::createReading() const
-{
- return new QmlAltimeterReading(m_sensor);
-}
-
-QSensor *QmlAltimeter::sensor() const
-{
- return m_sensor;
-}
-
-/*!
- \qmltype AltimeterReading
- \instantiates QmlAltimeterReading
- \ingroup qml-sensors_reading
- \inqmlmodule QtSensors
- \since QtSensors 5.1
- \inherits SensorReading
- \brief The AltimeterReading element holds the most recent Altimeter reading.
-
- The AltimeterReading element holds the most recent Altimeter reading.
-
- This element wraps the QAltimeterReading class. Please see the documentation for
- QAltimeterReading for details.
-
- This element cannot be directly created.
-*/
-
-QmlAltimeterReading::QmlAltimeterReading(QAltimeter *sensor)
- : m_sensor(sensor)
-{
-}
-
-QmlAltimeterReading::~QmlAltimeterReading()
-{
-}
-
-/*!
- \qmlproperty qreal AltimeterReading::altitude
- This property holds the altitude of the device.
-
- Please see QAltimeterReading::altitude for information about this property.
-*/
-
-qreal QmlAltimeterReading::altitude() const
-{
- return m_altitude;
-}
-
-QBindable<qreal> QmlAltimeterReading::bindableAltitude() const
-{
- return &m_altitude;
-}
-
-QSensorReading *QmlAltimeterReading::reading() const
-{
- return m_sensor->reading();
-}
-
-void QmlAltimeterReading::readingUpdate()
-{
- m_altitude = m_sensor->reading()->altitude();
-}
diff --git a/src/sensorsquick/qmlaltimeter_p.h b/src/sensorsquick/qmlaltimeter_p.h
deleted file mode 100644
index 19f124cb..00000000
--- a/src/sensorsquick/qmlaltimeter_p.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Research In Motion
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtSensors module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef QMLALTIMETER_P_H
-#define QMLALTIMETER_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlsensor_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QAltimeter;
-
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAltimeter : public QmlSensor
-{
- Q_OBJECT
- QML_NAMED_ELEMENT(Altimeter)
- QML_ADDED_IN_VERSION(5,1)
-public:
- explicit QmlAltimeter(QObject *parent = 0);
- ~QmlAltimeter();
-
- QSensor *sensor() const override;
-
-private:
- QmlSensorReading *createReading() const override;
- QAltimeter *m_sensor;
-};
-
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAltimeterReading : public QmlSensorReading
-{
- Q_OBJECT
- Q_PROPERTY(qreal altitude READ altitude
- NOTIFY altitudeChanged BINDABLE bindableAltitude)
- QML_NAMED_ELEMENT(AltimeterReading)
- QML_UNCREATABLE("Cannot create AltimeterReading")
- QML_ADDED_IN_VERSION(5,1)
-public:
- explicit QmlAltimeterReading(QAltimeter *sensor);
- ~QmlAltimeterReading();
-
- qreal altitude() const;
- QBindable<qreal> bindableAltitude() const;
-
-Q_SIGNALS:
- void altitudeChanged();
-
-private:
- QSensorReading *reading() const override;
- void readingUpdate() override;
-
- QAltimeter *m_sensor;
- Q_OBJECT_BINDABLE_PROPERTY(QmlAltimeterReading, qreal,
- m_altitude, &QmlAltimeterReading::altitudeChanged)
-};
-
-QT_END_NAMESPACE
-#endif
diff --git a/src/sensorsquick/qmldistancesensor.cpp b/src/sensorsquick/qmldistancesensor.cpp
deleted file mode 100644
index a779fbb2..00000000
--- a/src/sensorsquick/qmldistancesensor.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 BlackBerry Limited. All rights reserved.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtSensors module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "qmldistancesensor_p.h"
-#include <QDistanceSensor>
-
-/*!
- \qmltype DistanceSensor
- \instantiates QmlDistanceSensor
- \ingroup qml-sensors_type
- \inqmlmodule QtSensors
- \since QtSensors 5.4
- \inherits Sensor
- \brief The DistanceSensor element reports the distance in cm from an object to the device.
-
- The DistanceSensor element reports the distance in cm from an object to the device.
-
- This element wraps the QDistanceSensor class. Please see the documentation for
- QDistanceSensor for details.
-
- \sa DistanceReading
-*/
-
-QmlDistanceSensor::QmlDistanceSensor(QObject *parent)
- : QmlSensor(parent)
- , m_sensor(new QDistanceSensor(this))
-{
-}
-
-QmlDistanceSensor::~QmlDistanceSensor()
-{
-}
-
-QmlSensorReading *QmlDistanceSensor::createReading() const
-{
- return new QmlDistanceReading(m_sensor);
-}
-
-QSensor *QmlDistanceSensor::sensor() const
-{
- return m_sensor;
-}
-
-/*!
- \qmltype DistanceReading
- \instantiates QmlDistanceReading
- \ingroup qml-sensors_reading
- \inqmlmodule QtSensors
- \since QtSensors 5.4
- \inherits SensorReading
- \brief The DistanceReading element holds the most recent DistanceSensor reading.
-
- The DistanceReading element holds the most recent DistanceSensor reading.
-
- This element wraps the QDistanceReading class. Please see the documentation for
- QDistanceReading for details.
-
- This element cannot be directly created.
-*/
-
-QmlDistanceReading::QmlDistanceReading(QDistanceSensor *sensor)
- : m_sensor(sensor)
- , m_distance(0.0)
-{
-}
-
-QmlDistanceReading::~QmlDistanceReading()
-{
-}
-
-/*!
- \qmlproperty qreal DistanceReading::distance
- This property holds the distance measurement
-
- Please see QDistanceReading::distance for information about this property.
-*/
-
-qreal QmlDistanceReading::distance() const
-{
- return m_distance;
-}
-
-QBindable<qreal> QmlDistanceReading::bindableDistance() const
-{
- return &m_distance;
-}
-
-
-QSensorReading *QmlDistanceReading::reading() const
-{
- return m_sensor->reading();
-}
-
-void QmlDistanceReading::readingUpdate()
-{
- m_distance = m_sensor->reading()->distance();
-}
diff --git a/src/sensorsquick/qmldistancesensor_p.h b/src/sensorsquick/qmldistancesensor_p.h
deleted file mode 100644
index 9692a997..00000000
--- a/src/sensorsquick/qmldistancesensor_p.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 BlackBerry Limited. All rights reserved.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtSensors module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLDISTANCESENSOR_P_H
-#define QMLDISTANCESENSOR_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlsensor_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QDistanceSensor;
-
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlDistanceSensor : public QmlSensor
-{
- Q_OBJECT
- QML_NAMED_ELEMENT(DistanceSensor)
- QML_ADDED_IN_VERSION(5,4)
-public:
- explicit QmlDistanceSensor(QObject *parent = 0);
- ~QmlDistanceSensor();
-
- QSensor *sensor() const override;
-
-private:
- QmlSensorReading *createReading() const override;
-
- QDistanceSensor *m_sensor;
-};
-
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlDistanceReading : public QmlSensorReading
-{
- Q_OBJECT
- Q_PROPERTY(qreal distance READ distance NOTIFY distanceChanged BINDABLE bindableDistance)
- QML_NAMED_ELEMENT(DistanceReading)
- QML_UNCREATABLE("Cannot create DistanceReading")
- QML_ADDED_IN_VERSION(5,4)
-public:
- explicit QmlDistanceReading(QDistanceSensor *sensor);
- ~QmlDistanceReading();
-
- qreal distance() const;
- QBindable<qreal> bindableDistance() const;
-
-Q_SIGNALS:
- void distanceChanged();
-
-private:
- QSensorReading *reading() const override;
- void readingUpdate() override;
-
- QDistanceSensor *m_sensor;
- Q_OBJECT_BINDABLE_PROPERTY(QmlDistanceReading, qreal,
- m_distance, &QmlDistanceReading::distanceChanged)
-};
-
-QT_END_NAMESPACE
-#endif
diff --git a/src/sensorsquick/qmlholstersensor.cpp b/src/sensorsquick/qmlholstersensor.cpp
deleted file mode 100644
index b8b28b32..00000000
--- a/src/sensorsquick/qmlholstersensor.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Research In Motion
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtSensors module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "qmlholstersensor_p.h"
-#include <QtSensors/QHolsterSensor>
-
-/*!
- \qmltype HolsterSensor
- \instantiates QmlHolsterSensor
- \ingroup qml-sensors_type
- \inqmlmodule QtSensors
- \since QtSensors 5.1
- \inherits Sensor
- \brief The HolsterSensor element reports on whether a device is holstered.
-
- The HolsterSensor element reports on whether a device is holstered.
-
- This element wraps the QHolsterSensor class. Please see the documentation for
- QHolsterSensor for details.
-
- \sa HolsterReading
-*/
-
-QmlHolsterSensor::QmlHolsterSensor(QObject *parent)
- : QmlSensor(parent)
- , m_sensor(new QHolsterSensor(this))
-{
-}
-
-QmlHolsterSensor::~QmlHolsterSensor()
-{
-}
-
-QmlSensorReading *QmlHolsterSensor::createReading() const
-{
- return new QmlHolsterReading(m_sensor);
-}
-
-QSensor *QmlHolsterSensor::sensor() const
-{
- return m_sensor;
-}
-
-/*!
- \qmltype HolsterReading
- \instantiates QmlHolsterReading
- \ingroup qml-sensors_reading
- \inqmlmodule QtSensors
- \since QtSensors 5.1
- \inherits SensorReading
- \brief The HolsterReading element holds the most recent HolsterSensor reading.
-
- The HolsterReading element holds the most recent HolsterSensor reading.
-
- This element wraps the QHolsterReading class. Please see the documentation for
- QHolsterReading for details.
-
- This element cannot be directly created.
-*/
-
-QmlHolsterReading::QmlHolsterReading(QHolsterSensor *sensor)
- : m_sensor(sensor)
- , m_holstered(false)
-{
-}
-
-QmlHolsterReading::~QmlHolsterReading()
-{
-}
-
-/*!
- \qmlproperty qreal HolsterReading::holstered
- This property holds whether the device is holstered.
-
- Please see QHolsterReading::holstered for information about this property.
-*/
-
-bool QmlHolsterReading::holstered() const
-{
- return m_holstered;
-}
-
-QBindable<bool> QmlHolsterReading::bindableHolstered() const
-{
- return &m_holstered;
-}
-
-QSensorReading *QmlHolsterReading::reading() const
-{
- return m_sensor->reading();
-}
-
-void QmlHolsterReading::readingUpdate()
-{
- m_holstered = m_sensor->reading()->holstered();
-}
diff --git a/src/sensorsquick/qmlholstersensor_p.h b/src/sensorsquick/qmlholstersensor_p.h
deleted file mode 100644
index 39803764..00000000
--- a/src/sensorsquick/qmlholstersensor_p.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Research In Motion
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtSensors module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef QMLHOLSTERSENSOR_P_H
-#define QMLHOLSTERSENSOR_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlsensor_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QHolsterSensor;
-
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlHolsterSensor : public QmlSensor
-{
- Q_OBJECT
- QML_NAMED_ELEMENT(HolsterSensor)
- QML_ADDED_IN_VERSION(5,1)
-public:
- explicit QmlHolsterSensor(QObject *parent = 0);
- ~QmlHolsterSensor();
-
- QSensor *sensor() const override;
-
-private:
- QmlSensorReading *createReading() const override;
-
- QHolsterSensor *m_sensor;
-};
-
-class Q_SENSORSQUICK_PRIVATE_EXPORT QmlHolsterReading : public QmlSensorReading
-{
- Q_OBJECT
- Q_PROPERTY(bool holstered READ holstered
- NOTIFY holsteredChanged BINDABLE bindableHolstered)
- QML_NAMED_ELEMENT(HolsterReading)
- QML_UNCREATABLE("Cannot create HolsterReading")
- QML_ADDED_IN_VERSION(5,1)
-public:
- explicit QmlHolsterReading(QHolsterSensor *sensor);
- ~QmlHolsterReading();
-
- bool holstered() const;
- QBindable<bool> bindableHolstered() const;
-
-Q_SIGNALS:
- void holsteredChanged();
-
-private:
- QSensorReading *reading() const override;
- void readingUpdate() override;
-
- QHolsterSensor *m_sensor;
- Q_OBJECT_BINDABLE_PROPERTY(QmlHolsterReading, bool,
- m_holstered, &QmlHolsterReading::holsteredChanged)
-};
-
-QT_END_NAMESPACE
-#endif
diff --git a/src/sensorsquick/qmlirproximitysensor.cpp b/src/sensorsquick/qmlirproximitysensor.cpp
index 81c41f33..bcc24937 100644
--- a/src/sensorsquick/qmlirproximitysensor.cpp
+++ b/src/sensorsquick/qmlirproximitysensor.cpp
@@ -48,6 +48,7 @@
\since QtSensors 5.0
\inherits Sensor
\brief The IRProximitySensor element reports on infra-red reflectance values.
+ \internal
This element wraps the QIRProximitySensor class. Please see the documentation for
QIRProximitySensor for details.
@@ -83,6 +84,7 @@ QSensor *QmlIRProximitySensor::sensor() const
\since QtSensors 5.0
\inherits SensorReading
\brief The IRProximityReading element holds the most recent IR proximity reading.
+ \internal
The IRProximityReading element holds the most recent IR proximity reading.
diff --git a/src/sensorsquick/qmllidsensor.cpp b/src/sensorsquick/qmllidsensor.cpp
index 3c841f2b..0ec4a17f 100644
--- a/src/sensorsquick/qmllidsensor.cpp
+++ b/src/sensorsquick/qmllidsensor.cpp
@@ -47,6 +47,7 @@
\since QtSensors 5.9
\inherits Sensor
\brief The LidSensor element reports on whether a device is closed.
+ \internal
The LidSensor element reports on whether a device is closed.
@@ -84,6 +85,7 @@ QSensor *QmlLidSensor::sensor() const
\since QtSensors 5.9
\inherits SensorReading
\brief The LidReading element holds the most recent LidSensor reading.
+ \internal
The LidReading element holds the most recent LidSensor reading.
diff --git a/src/sensorsquick/qmltapsensor.cpp b/src/sensorsquick/qmltapsensor.cpp
index ae89cc4b..90a08de0 100644
--- a/src/sensorsquick/qmltapsensor.cpp
+++ b/src/sensorsquick/qmltapsensor.cpp
@@ -49,6 +49,7 @@
\inherits Sensor
\brief The TapSensor element reports tap and double tap events
along the X, Y and Z axes.
+ \internal
The TapSensor element reports tap and double tap events
along the X, Y and Z axes.
@@ -106,6 +107,7 @@ void QmlTapSensor::setReturnDoubleTapEvents(bool ret)
\since QtSensors 5.0
\inherits SensorReading
\brief The TapReading element holds the most recent TapSensor reading.
+ \internal
The TapReading element holds the most recent TapSensor reading.