diff options
Diffstat (limited to 'src/imports/sensors')
26 files changed, 251 insertions, 28 deletions
diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes index 0790533d..461ca8f1 100644 --- a/src/imports/sensors/plugins.qmltypes +++ b/src/imports/sensors/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.1 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -notrelocatable QtSensors 5.3' +// 'qmlplugindump -notrelocatable QtSensors 5.4' Module { Component { @@ -51,7 +51,7 @@ Module { exports: [ "QtSensors/Altimeter 5.1", "QtSensors/Altimeter 5.2", - "QtSensors/Altimeter 5.3" + "QtSensors/Altimeter 5.4" ] exportMetaObjectRevisions: [0, 0, 0] } diff --git a/src/imports/sensors/qmlaccelerometer.cpp b/src/imports/sensors/qmlaccelerometer.cpp index be153eb6..1a6ee07e 100644 --- a/src/imports/sensors/qmlaccelerometer.cpp +++ b/src/imports/sensors/qmlaccelerometer.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlaccelerometer.h" -#include <QAccelerometer> +#include <QtSensors/QAccelerometer> /*! \qmltype Accelerometer diff --git a/src/imports/sensors/qmlaltimeter.cpp b/src/imports/sensors/qmlaltimeter.cpp index 317b759e..36868381 100644 --- a/src/imports/sensors/qmlaltimeter.cpp +++ b/src/imports/sensors/qmlaltimeter.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ #include "qmlaltimeter.h" -#include <QAltimeter> +#include <QtSensors/QAltimeter> /*! \qmltype Altimeter diff --git a/src/imports/sensors/qmlambientlightsensor.cpp b/src/imports/sensors/qmlambientlightsensor.cpp index 32c4261b..64a635b4 100644 --- a/src/imports/sensors/qmlambientlightsensor.cpp +++ b/src/imports/sensors/qmlambientlightsensor.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlambientlightsensor.h" -#include <QAmbientLightSensor> +#include <QtSensors/QAmbientLightSensor> /*! \qmltype AmbientLightSensor diff --git a/src/imports/sensors/qmlambientlightsensor.h b/src/imports/sensors/qmlambientlightsensor.h index 7715a39f..f37b2914 100644 --- a/src/imports/sensors/qmlambientlightsensor.h +++ b/src/imports/sensors/qmlambientlightsensor.h @@ -43,7 +43,7 @@ #define QMLAMBIENTLIGHTSENSOR_H #include "qmlsensor.h" -#include <QAmbientLightSensor> +#include <QtSensors/QAmbientLightSensor> QT_BEGIN_NAMESPACE diff --git a/src/imports/sensors/qmlambienttemperaturesensor.cpp b/src/imports/sensors/qmlambienttemperaturesensor.cpp index 6128af13..4a81b0d3 100644 --- a/src/imports/sensors/qmlambienttemperaturesensor.cpp +++ b/src/imports/sensors/qmlambienttemperaturesensor.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ #include "qmlambienttemperaturesensor.h" -#include <QAmbientTemperatureSensor> +#include <QtSensors/QAmbientTemperatureSensor> /*! \qmltype AmbientTemperatureSensor diff --git a/src/imports/sensors/qmlcompass.cpp b/src/imports/sensors/qmlcompass.cpp index ce5f4280..52d7ac20 100644 --- a/src/imports/sensors/qmlcompass.cpp +++ b/src/imports/sensors/qmlcompass.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlcompass.h" -#include <QCompass> +#include <QtSensors/QCompass> /*! \qmltype Compass diff --git a/src/imports/sensors/qmldistancesensor.cpp b/src/imports/sensors/qmldistancesensor.cpp new file mode 100644 index 00000000..549c9e1e --- /dev/null +++ b/src/imports/sensors/qmldistancesensor.cpp @@ -0,0 +1,133 @@ +/**************************************************************************** +** +** Copyright (C) 2014 BlackBerry Limited. All rights reserved. +** Contact: http://www.qt-project.org/legal +** +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include "qmldistancesensor.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) + : QmlSensorReading(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; +} + +QSensorReading *QmlDistanceReading::reading() const +{ + return m_sensor->reading(); +} + +void QmlDistanceReading::readingUpdate() +{ + qreal distance = m_sensor->reading()->distance(); + if (m_distance != distance) { + m_distance = distance; + Q_EMIT distanceChanged(); + } +} diff --git a/src/imports/sensors/qmldistancesensor.h b/src/imports/sensors/qmldistancesensor.h new file mode 100644 index 00000000..3f1f51a7 --- /dev/null +++ b/src/imports/sensors/qmldistancesensor.h @@ -0,0 +1,87 @@ +/**************************************************************************** +** +** Copyright (C) 2014 BlackBerry Limited. All rights reserved. +** Contact: http://www.qt-project.org/legal +** +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QMLDISTANCESENSOR_H +#define QMLDISTANCESENSOR_H + +#include "qmlsensor.h" + +QT_BEGIN_NAMESPACE + +class QDistanceSensor; + +class QmlDistanceSensor : public QmlSensor +{ + Q_OBJECT +public: + explicit QmlDistanceSensor(QObject *parent = 0); + ~QmlDistanceSensor(); + +private: + QSensor *sensor() const Q_DECL_OVERRIDE; + QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + + QDistanceSensor *m_sensor; +}; + +class QmlDistanceReading : public QmlSensorReading +{ + Q_OBJECT + Q_PROPERTY(qreal distance READ distance NOTIFY distanceChanged) +public: + explicit QmlDistanceReading(QDistanceSensor *sensor); + ~QmlDistanceReading(); + + qreal distance() const; + +Q_SIGNALS: + void distanceChanged(); + +private: + QSensorReading *reading() const Q_DECL_OVERRIDE; + void readingUpdate() Q_DECL_OVERRIDE; + + QDistanceSensor *m_sensor; + qreal m_distance; +}; + +QT_END_NAMESPACE +#endif diff --git a/src/imports/sensors/qmlgyroscope.cpp b/src/imports/sensors/qmlgyroscope.cpp index 1e936800..f52251f1 100644 --- a/src/imports/sensors/qmlgyroscope.cpp +++ b/src/imports/sensors/qmlgyroscope.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlgyroscope.h" -#include <QGyroscope> +#include <QtSensors/QGyroscope> /*! \qmltype Gyroscope diff --git a/src/imports/sensors/qmlholstersensor.cpp b/src/imports/sensors/qmlholstersensor.cpp index b5fd8c8b..7e00235f 100644 --- a/src/imports/sensors/qmlholstersensor.cpp +++ b/src/imports/sensors/qmlholstersensor.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ #include "qmlholstersensor.h" -#include <QHolsterSensor> +#include <QtSensors/QHolsterSensor> /*! \qmltype HolsterSensor diff --git a/src/imports/sensors/qmlirproximitysensor.cpp b/src/imports/sensors/qmlirproximitysensor.cpp index 3263fc6c..896840db 100644 --- a/src/imports/sensors/qmlirproximitysensor.cpp +++ b/src/imports/sensors/qmlirproximitysensor.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlirproximitysensor.h" -#include <QIRProximitySensor> +#include <QtSensors/QIRProximitySensor> /*! \qmltype IRProximitySensor diff --git a/src/imports/sensors/qmllightsensor.cpp b/src/imports/sensors/qmllightsensor.cpp index 8d12ad42..9d76e421 100644 --- a/src/imports/sensors/qmllightsensor.cpp +++ b/src/imports/sensors/qmllightsensor.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmllightsensor.h" -#include <QLightSensor> +#include <QtSensors/QLightSensor> /*! \qmltype LightSensor diff --git a/src/imports/sensors/qmlmagnetometer.cpp b/src/imports/sensors/qmlmagnetometer.cpp index aa1a05d2..f617962d 100644 --- a/src/imports/sensors/qmlmagnetometer.cpp +++ b/src/imports/sensors/qmlmagnetometer.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlmagnetometer.h" -#include <QMagnetometer> +#include <QtSensors/QMagnetometer> /*! \qmltype Magnetometer diff --git a/src/imports/sensors/qmlorientationsensor.cpp b/src/imports/sensors/qmlorientationsensor.cpp index d0c86dd3..d8661998 100644 --- a/src/imports/sensors/qmlorientationsensor.cpp +++ b/src/imports/sensors/qmlorientationsensor.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlorientationsensor.h" -#include <QOrientationSensor> +#include <QtSensors/QOrientationSensor> /*! \qmltype OrientationSensor diff --git a/src/imports/sensors/qmlorientationsensor.h b/src/imports/sensors/qmlorientationsensor.h index 35e9d6fb..4927b58b 100644 --- a/src/imports/sensors/qmlorientationsensor.h +++ b/src/imports/sensors/qmlorientationsensor.h @@ -43,7 +43,7 @@ #define QMLORIENTATIONSENSOR_H #include "qmlsensor.h" -#include <QOrientationSensor> +#include <QtSensors/QOrientationSensor> QT_BEGIN_NAMESPACE diff --git a/src/imports/sensors/qmlpressuresensor.cpp b/src/imports/sensors/qmlpressuresensor.cpp index a9736c4f..a22762a3 100644 --- a/src/imports/sensors/qmlpressuresensor.cpp +++ b/src/imports/sensors/qmlpressuresensor.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ #include "qmlpressuresensor.h" -#include <QPressureSensor> +#include <QtSensors/QPressureSensor> /*! \qmltype PressureSensor diff --git a/src/imports/sensors/qmlproximitysensor.cpp b/src/imports/sensors/qmlproximitysensor.cpp index 21c92c91..702833db 100644 --- a/src/imports/sensors/qmlproximitysensor.cpp +++ b/src/imports/sensors/qmlproximitysensor.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlproximitysensor.h" -#include <QProximitySensor> +#include <QtSensors/QProximitySensor> /*! \qmltype ProximitySensor diff --git a/src/imports/sensors/qmlrotationsensor.cpp b/src/imports/sensors/qmlrotationsensor.cpp index 42541487..eb125996 100644 --- a/src/imports/sensors/qmlrotationsensor.cpp +++ b/src/imports/sensors/qmlrotationsensor.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlrotationsensor.h" -#include <QRotationSensor> +#include <QtSensors/QRotationSensor> /*! \qmltype RotationSensor diff --git a/src/imports/sensors/qmlsensor.cpp b/src/imports/sensors/qmlsensor.cpp index b8f049c1..a9cff391 100644 --- a/src/imports/sensors/qmlsensor.cpp +++ b/src/imports/sensors/qmlsensor.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlsensor.h" -#include <QSensor> +#include <QtSensors/QSensor> #include <QDebug> QT_BEGIN_NAMESPACE diff --git a/src/imports/sensors/qmlsensorgesture.cpp b/src/imports/sensors/qmlsensorgesture.cpp index 42aa25f7..42bb3585 100644 --- a/src/imports/sensors/qmlsensorgesture.cpp +++ b/src/imports/sensors/qmlsensorgesture.cpp @@ -1,4 +1,4 @@ -/**************************************************************************** + /**************************************************************************** ** ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal @@ -40,8 +40,8 @@ ****************************************************************************/ #include "qmlsensorgesture.h" -#include <qsensorgesture.h> -#include <qsensorgesturemanager.h> +#include <QtSensors/qsensorgesture.h> +#include <QtSensors/qsensorgesturemanager.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/sensors/qmlsensorglobal.cpp b/src/imports/sensors/qmlsensorglobal.cpp index ea8e44d6..bd0dc213 100644 --- a/src/imports/sensors/qmlsensorglobal.cpp +++ b/src/imports/sensors/qmlsensorglobal.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlsensorglobal.h" -#include <QSensor> +#include <QtSensors/QSensor> QT_BEGIN_NAMESPACE diff --git a/src/imports/sensors/qmltapsensor.cpp b/src/imports/sensors/qmltapsensor.cpp index 266a4f94..d86d0aaf 100644 --- a/src/imports/sensors/qmltapsensor.cpp +++ b/src/imports/sensors/qmltapsensor.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmltapsensor.h" -#include <QTapSensor> +#include <QtSensors/QTapSensor> /*! \qmltype TapSensor diff --git a/src/imports/sensors/qmltapsensor.h b/src/imports/sensors/qmltapsensor.h index b0c2fa5c..38b15497 100644 --- a/src/imports/sensors/qmltapsensor.h +++ b/src/imports/sensors/qmltapsensor.h @@ -43,7 +43,7 @@ #define QMLTAPSENSOR_H #include "qmlsensor.h" -#include <QTapSensor> +#include <QtSensors/QTapSensor> QT_BEGIN_NAMESPACE diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp index 8e52590a..bca55fab 100644 --- a/src/imports/sensors/sensors.cpp +++ b/src/imports/sensors/sensors.cpp @@ -216,9 +216,10 @@ public: qmlRegisterType <QmlSensorGesture >(package, major, minor, "SensorGesture"); - // Register the 5.3 interfaces - // No API changes, just reintroduce existing interfaces for 5.3 - minor = 3; + // Register the 5.4 interfaces + // No API changes, just reintroduce existing interfaces for 5.2 + // Implicitly registers 5.3 too + minor = 4; qmlRegisterType <QmlAltimeter >(package, major, minor, "Altimeter"); } }; diff --git a/src/imports/sensors/sensors.pro b/src/imports/sensors/sensors.pro index 2236ce11..73e9c189 100644 --- a/src/imports/sensors/sensors.pro +++ b/src/imports/sensors/sensors.pro @@ -13,6 +13,7 @@ HEADERS += \ qmlambientlightsensor.h \ qmlambienttemperaturesensor.h \ qmlcompass.h \ + qmldistancesensor.h \ qmlgyroscope.h \ qmlholstersensor.h \ qmlirproximitysensor.h \ @@ -35,6 +36,7 @@ SOURCES += sensors.cpp \ qmlambientlightsensor.cpp \ qmlambienttemperaturesensor.cpp \ qmlcompass.cpp \ + qmldistancesensor.cpp \ qmlgyroscope.cpp \ qmlholstersensor.cpp \ qmlirproximitysensor.cpp \ |