diff options
Diffstat (limited to 'src/sensorsquick/qmltiltsensor_p.h')
-rw-r--r-- | src/sensorsquick/qmltiltsensor_p.h | 59 |
1 files changed, 14 insertions, 45 deletions
diff --git a/src/sensorsquick/qmltiltsensor_p.h b/src/sensorsquick/qmltiltsensor_p.h index f41757b3..d660229d 100644 --- a/src/sensorsquick/qmltiltsensor_p.h +++ b/src/sensorsquick/qmltiltsensor_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QMLTILTSENSOR_P_H #define QMLTILTSENSOR_P_H @@ -58,7 +22,7 @@ QT_BEGIN_NAMESPACE class QTiltSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlTiltSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlTiltSensor : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(TiltSensor) @@ -69,17 +33,18 @@ public: ~QmlTiltSensor(); Q_INVOKABLE void calibrate(); -private: QSensor *sensor() const override; + +private: QTiltSensor *m_sensor; QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlTiltSensorReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlTiltSensorReading : public QmlSensorReading { Q_OBJECT - Q_PROPERTY(qreal yRotation READ yRotation NOTIFY yRotationChanged) - Q_PROPERTY(qreal xRotation READ xRotation NOTIFY xRotationChanged) + Q_PROPERTY(qreal yRotation READ yRotation NOTIFY yRotationChanged BINDABLE bindableYRotation) + Q_PROPERTY(qreal xRotation READ xRotation NOTIFY xRotationChanged BINDABLE bindableXRotation) QML_NAMED_ELEMENT(TiltReading) QML_UNCREATABLE("Cannot create TiltReading") QML_ADDED_IN_VERSION(5,0) @@ -88,7 +53,9 @@ public: ~QmlTiltSensorReading(); qreal yRotation() const; + QBindable<qreal> bindableYRotation() const; qreal xRotation() const; + QBindable<qreal> bindableXRotation() const; Q_SIGNALS: void yRotationChanged(); @@ -98,8 +65,10 @@ private: QSensorReading *reading() const override; void readingUpdate() override; QTiltSensor *m_sensor; - qreal m_yRotation; - qreal m_xRotation; + Q_OBJECT_BINDABLE_PROPERTY(QmlTiltSensorReading, qreal, + m_yRotation, &QmlTiltSensorReading::yRotationChanged) + Q_OBJECT_BINDABLE_PROPERTY(QmlTiltSensorReading, qreal, + m_xRotation, &QmlTiltSensorReading::xRotationChanged) }; QT_END_NAMESPACE |