diff options
author | Juha Vuolle <juha.vuolle@insta.fi> | 2021-05-21 10:01:56 +0300 |
---|---|---|
committer | Juha Vuolle <juha.vuolle@insta.fi> | 2021-05-26 09:48:04 +0300 |
commit | 0193d164e79845f7a2b5a388ed2818854c77399f (patch) | |
tree | 68d05a426a53d39c0bce34705dd91fbbbc9c24e5 /src/sensorsquick/qmlproximitysensor_p.h | |
parent | cf21f9074be72e9d5a1c45638bf6762edad7a73f (diff) |
Split the Sensors QML plugin into a library and a plugin
The main changes:
- Introduction of new SensorsQuick library with private exports
- The original QML plugin loads this new library and does little else
- Renamed original 'sensors' plugin as 'declarative_sensors' to provide
an idea what it relates to
- Renamed library headers as private "_p.h" and added "We mean it"
- Changed qmlRegister* calls to QML_ELEMENT macros
- Removed files that are generated in Qt6 (qmldir, plugins.qmltypes)
Task-number: QTBUG-92530
Change-Id: I18f849adabcc79ac47e67305f78aefeee82801bc
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/sensorsquick/qmlproximitysensor_p.h')
-rw-r--r-- | src/sensorsquick/qmlproximitysensor_p.h | 102 |
1 files changed, 102 insertions, 0 deletions
diff --git a/src/sensorsquick/qmlproximitysensor_p.h b/src/sensorsquick/qmlproximitysensor_p.h new file mode 100644 index 00000000..9d28dfcf --- /dev/null +++ b/src/sensorsquick/qmlproximitysensor_p.h @@ -0,0 +1,102 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +#ifndef QMLPROXIMITYSENSOR_P_H +#define QMLPROXIMITYSENSOR_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" +#ifdef near +#undef near +#endif +QT_BEGIN_NAMESPACE + +class QProximitySensor; + +class Q_SENSORSQUICK_PRIVATE_EXPORT QmlProximitySensor : public QmlSensor +{ + Q_OBJECT + QML_NAMED_ELEMENT(ProximitySensor) + QML_ADDED_IN_VERSION(5,0) +public: + explicit QmlProximitySensor(QObject *parent = 0); + ~QmlProximitySensor(); + + +private: + QSensor *sensor() const override; + QProximitySensor *m_sensor; + QmlSensorReading *createReading() const override; +}; + +class Q_SENSORSQUICK_PRIVATE_EXPORT QmlProximitySensorReading : public QmlSensorReading +{ + Q_OBJECT + Q_PROPERTY(bool near READ near NOTIFY nearChanged) + QML_NAMED_ELEMENT(ProximityReading) + QML_UNCREATABLE("Cannot create ProximityReading") + QML_ADDED_IN_VERSION(5,0) +public: + explicit QmlProximitySensorReading(QProximitySensor *sensor); + ~QmlProximitySensorReading(); + + bool near() const; + +Q_SIGNALS: + void nearChanged(); + +private: + QSensorReading *reading() const override; + void readingUpdate() override; + QProximitySensor *m_sensor; + bool m_near; +}; + +QT_END_NAMESPACE +#endif |