diff options
Diffstat (limited to 'src/sensorsquick/qmlpressuresensor_p.h')
| -rw-r--r-- | src/sensorsquick/qmlpressuresensor_p.h | 60 |
1 files changed, 15 insertions, 45 deletions
diff --git a/src/sensorsquick/qmlpressuresensor_p.h b/src/sensorsquick/qmlpressuresensor_p.h index b4b353d1..8b531fba 100644 --- a/src/sensorsquick/qmlpressuresensor_p.h +++ b/src/sensorsquick/qmlpressuresensor_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ +// Copyright (C) 2016 Research In Motion +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QMLPRESSURESENSOR_P_H #define QMLPRESSURESENSOR_P_H @@ -56,7 +20,7 @@ QT_BEGIN_NAMESPACE class QPressureSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlPressureSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlPressureSensor : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(PressureSensor) @@ -65,18 +29,20 @@ public: explicit QmlPressureSensor(QObject *parent = 0); ~QmlPressureSensor(); -private: QSensor *sensor() const override; + +private: QmlSensorReading *createReading() const override; QPressureSensor *m_sensor; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlPressureReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlPressureReading : public QmlSensorReading { Q_OBJECT - Q_PROPERTY(qreal pressure READ pressure NOTIFY pressureChanged) - Q_PROPERTY(qreal temperature READ temperature NOTIFY temperatureChanged REVISION 1) + Q_PROPERTY(qreal pressure READ pressure NOTIFY pressureChanged BINDABLE bindablePressure) + Q_PROPERTY(qreal temperature READ temperature + NOTIFY temperatureChanged REVISION 1 BINDABLE bindableTemperature) QML_NAMED_ELEMENT(PressureReading) QML_UNCREATABLE("Cannot create PressureReading") QML_ADDED_IN_VERSION(5,1) @@ -85,7 +51,9 @@ public: ~QmlPressureReading(); qreal pressure() const; + QBindable<qreal> bindablePressure() const; qreal temperature() const; + QBindable<qreal> bindableTemperature() const; Q_SIGNALS: void pressureChanged(); @@ -96,8 +64,10 @@ private: void readingUpdate() override; QPressureSensor *m_sensor; - qreal m_pressure; - qreal m_temperature; + Q_OBJECT_BINDABLE_PROPERTY(QmlPressureReading, qreal, + m_pressure, &QmlPressureReading::pressureChanged) + Q_OBJECT_BINDABLE_PROPERTY(QmlPressureReading, qreal, + m_temperature, &QmlPressureReading::temperatureChanged) }; QT_END_NAMESPACE |