summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf2
-rw-r--r--src/imports/sensors/qmlaccelerometer.cpp2
-rw-r--r--src/imports/sensors/qmlaltimeter.cpp2
-rw-r--r--src/imports/sensors/qmlambientlightsensor.cpp2
-rw-r--r--src/imports/sensors/qmlambientlightsensor.h2
-rw-r--r--src/imports/sensors/qmlambienttemperaturesensor.cpp2
-rw-r--r--src/imports/sensors/qmlcompass.cpp2
-rw-r--r--src/imports/sensors/qmldistancesensor.cpp133
-rw-r--r--src/imports/sensors/qmldistancesensor.h87
-rw-r--r--src/imports/sensors/qmlgyroscope.cpp2
-rw-r--r--src/imports/sensors/qmlholstersensor.cpp2
-rw-r--r--src/imports/sensors/qmlirproximitysensor.cpp2
-rw-r--r--src/imports/sensors/qmllightsensor.cpp2
-rw-r--r--src/imports/sensors/qmlmagnetometer.cpp2
-rw-r--r--src/imports/sensors/qmlorientationsensor.cpp2
-rw-r--r--src/imports/sensors/qmlorientationsensor.h2
-rw-r--r--src/imports/sensors/qmlpressuresensor.cpp2
-rw-r--r--src/imports/sensors/qmlproximitysensor.cpp2
-rw-r--r--src/imports/sensors/qmlrotationsensor.cpp2
-rw-r--r--src/imports/sensors/qmlsensor.cpp2
-rw-r--r--src/imports/sensors/qmlsensorgesture.cpp6
-rw-r--r--src/imports/sensors/qmlsensorglobal.cpp2
-rw-r--r--src/imports/sensors/qmltapsensor.cpp2
-rw-r--r--src/imports/sensors/qmltapsensor.h2
-rw-r--r--src/imports/sensors/sensors.pro2
-rw-r--r--src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h2
-rw-r--r--src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp2
-rw-r--r--src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h4
-rw-r--r--src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h2
-rw-r--r--src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h2
-rw-r--r--src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h2
-rw-r--r--src/plugins/sensorgestures/qtsensors/qshake2recognizer.h2
-rw-r--r--src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp1
-rw-r--r--src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h7
-rw-r--r--src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp2
-rw-r--r--src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h2
-rw-r--r--src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h2
-rw-r--r--src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h2
-rw-r--r--src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h2
-rw-r--r--src/plugins/sensorgestures/shake/qshakerecognizer.h2
-rw-r--r--src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp2
-rw-r--r--src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h2
-rw-r--r--src/plugins/sensors/blackberry/bbdistancesensor.cpp58
-rw-r--r--src/plugins/sensors/blackberry/bbdistancesensor.h60
-rw-r--r--src/plugins/sensors/blackberry/blackberry.pro2
-rw-r--r--src/plugins/sensors/blackberry/main.cpp6
-rw-r--r--src/plugins/sensors/generic/genericalssensor.h6
-rw-r--r--src/plugins/sensors/generic/genericorientationsensor.h6
-rw-r--r--src/plugins/sensors/generic/genericrotationsensor.h8
-rw-r--r--src/plugins/sensors/generic/generictiltsensor.h6
-rw-r--r--src/plugins/sensors/generic/main.cpp6
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp16
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwproximitysensor.h1
-rw-r--r--src/sensors/doc/qtsensors.qdocconf2
-rw-r--r--src/sensors/doc/src/compatmap.qdoc11
-rw-r--r--src/sensors/qdistancesensor.cpp164
-rw-r--r--src/sensors/qdistancesensor.h84
-rw-r--r--src/sensors/qdistancesensor_p.h77
-rw-r--r--src/sensors/sensors.pro5
-rw-r--r--tests/auto/qsensor/tst_qsensor.cpp28
-rw-r--r--tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp4
-rw-r--r--tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp14
62 files changed, 779 insertions, 95 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 00e3fcf4..e28797de 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.3.1
+MODULE_VERSION = 5.4.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.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 \
diff --git a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h
index 5df98cc2..87506b25 100644
--- a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h
@@ -43,7 +43,7 @@
#ifndef QCOVERSENSORGESTURERECOGNIZER_H
#define QCOVERSENSORGESTURERECOGNIZER_H
-#include <qsensorgesturerecognizer.h>
+#include <QtSensors/qsensorgesturerecognizer.h>
#include <QTimer>
#include "qtsensorgesturesensorhandler.h"
diff --git a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp
index 444a8e68..1a9f51b8 100644
--- a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp
+++ b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#include <QTapSensor>
+#include <QtSensors/QTapSensor>
#include "qdoubletapsensorgesturerecognizer.h"
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h
index e1e660b3..9d3ba840 100644
--- a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h
@@ -44,8 +44,8 @@
#include <QtSensors/QSensor>
-#include <qsensorgesturerecognizer.h>
-#include <QTapSensor>
+#include <QtSensors/qsensorgesturerecognizer.h>
+#include <QtSensors/QTapSensor>
#include "qtsensorgesturesensorhandler.h"
diff --git a/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h
index 9f72582a..7e2635a4 100644
--- a/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h
@@ -44,7 +44,7 @@
#ifndef QFREEFALLSENSORGESTURERECOGNIZER_H
#define QFREEFALLSENSORGESTURERECOGNIZER_H
-#include <qsensorgesturerecognizer.h>
+#include <QtSensors/qsensorgesturerecognizer.h>
#include "qtsensorgesturesensorhandler.h"
diff --git a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h
index d8dc0097..8749cd0b 100644
--- a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h
@@ -43,7 +43,7 @@
#ifndef QHOVERSENSORGESTURERECOGNIZER_H
#define QHOVERSENSORGESTURERECOGNIZER_H
-#include <QSensorGestureRecognizer>
+#include <QtSensors/QSensorGestureRecognizer>
#include "qtsensorgesturesensorhandler.h"
diff --git a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h
index 37f66058..55f6dd56 100644
--- a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h
@@ -43,7 +43,7 @@
#ifndef QPICKUPSENSORGESTURERECOGNIZER_H
#define QPICKUPSENSORGESTURERECOGNIZER_H
-#include <qsensorgesturerecognizer.h>
+#include <QtSensors/qsensorgesturerecognizer.h>
#include "qtsensorgesturesensorhandler.h"
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h
index 647b713f..cb232f80 100644
--- a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h
@@ -44,7 +44,7 @@
#include <QDebug>
-#include <qsensorgesturerecognizer.h>
+#include <QtSensors/qsensorgesturerecognizer.h>
#include "qtsensorgesturesensorhandler.h"
diff --git a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp
index c9f58ddd..22fccac9 100644
--- a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp
+++ b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp
@@ -42,6 +42,7 @@
#include "qslamgesturerecognizer.h"
#include "qtsensorgesturesensorhandler.h"
+
#include <QtCore/qmath.h>
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h
index 5dba87a5..232ae35e 100644
--- a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h
@@ -43,10 +43,11 @@
#ifndef QSLAMSENSORGESTURERECOGNIZER_H
#define QSLAMSENSORGESTURERECOGNIZER_H
-#include <qsensorgesturerecognizer.h>
-#include <QtSensors>
+#include <QtSensors/qsensorgesturerecognizer.h>
#include <QtSensors/QOrientationSensor>
-
+#include <QtSensors/QAccelerometer>
+#include <QtSensors/QAccelerometerReading>
+#include <QtSensors/QOrientationReading>
QT_BEGIN_NAMESPACE
class QSlamSensorGestureRecognizer : public QSensorGestureRecognizer
diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp
index 9715902a..f9999029 100644
--- a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp
+++ b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp
@@ -45,7 +45,7 @@
#include "qtsensorgestureplugin.h"
-#include <qsensorgestureplugininterface.h>
+#include <QtSensors/qsensorgestureplugininterface.h>
#include "qcoversensorgesturerecognizer.h"
#include "qtwistsensorgesturerecognizer.h"
diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
index 34455ace..d9e974a9 100644
--- a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
+++ b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
@@ -45,7 +45,7 @@
#include <QObject>
#include <QStringList>
-#include <qsensorgestureplugininterface.h>
+#include <QtSensors/qsensorgestureplugininterface.h>
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h
index 1729f3ee..7cf1ea8b 100644
--- a/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h
@@ -42,7 +42,7 @@
#ifndef QTURNOVERSENSORGESTURERECOGNIZER_H
#define QTURNOVERSENSORGESTURERECOGNIZER_H
-#include <qsensorgesturerecognizer.h>
+#include <QtSensors/qsensorgesturerecognizer.h>
#include "qtsensorgesturesensorhandler.h"
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h
index 5db192af..08c81510 100644
--- a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h
@@ -43,7 +43,7 @@
#ifndef QWFLICKSENSORGESTURERECOGNIZER_H
#define QWFLICKSENSORGESTURERECOGNIZER_H
-#include <qsensorgesturerecognizer.h>
+#include <QtSensors/qsensorgesturerecognizer.h>
#include <QtSensors/QAccelerometer>
#include <QtSensors/QOrientationSensor>
#include "qtsensorgesturesensorhandler.h"
diff --git a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h
index a8aef52e..487b80ef 100644
--- a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h
@@ -43,7 +43,7 @@
#ifndef QWHIPSENSORGESTURERECOGNIZER_H
#define QWHIPSENSORGESTURERECOGNIZER_H
-#include <qsensorgesturerecognizer.h>
+#include <QtSensors/qsensorgesturerecognizer.h>
#include "qtsensorgesturesensorhandler.h"
diff --git a/src/plugins/sensorgestures/shake/qshakerecognizer.h b/src/plugins/sensorgestures/shake/qshakerecognizer.h
index e7478b6a..64088f53 100644
--- a/src/plugins/sensorgestures/shake/qshakerecognizer.h
+++ b/src/plugins/sensorgestures/shake/qshakerecognizer.h
@@ -49,7 +49,7 @@
#include <QDebug>
#include <QTimer>
-#include <qsensorgesturerecognizer.h>
+#include <QtSensors/qsensorgesturerecognizer.h>
struct AccelData {
qreal x;
diff --git a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp
index d1204d22..4979b1dc 100644
--- a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp
+++ b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp
@@ -45,7 +45,7 @@
#include "qshakesensorgestureplugin.h"
-#include <qsensorgestureplugininterface.h>
+#include <QtSensors/qsensorgestureplugininterface.h>
#include "qshakerecognizer.h"
diff --git a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
index 939b2a9c..919a2c10 100644
--- a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
+++ b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
@@ -45,7 +45,7 @@
#include <QObject>
#include <QStringList>
-#include <qsensorgestureplugininterface.h>
+#include <QtSensors/qsensorgestureplugininterface.h>
class QShakeSensorGesturePlugin : public QObject, public QSensorGesturePluginInterface
{
diff --git a/src/plugins/sensors/blackberry/bbdistancesensor.cpp b/src/plugins/sensors/blackberry/bbdistancesensor.cpp
new file mode 100644
index 00000000..c40845a4
--- /dev/null
+++ b/src/plugins/sensors/blackberry/bbdistancesensor.cpp
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** 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 "bbdistancesensor.h"
+
+BbDistanceSensor::BbDistanceSensor(QSensor *sensor)
+ : BbSensorBackend<QDistanceReading>(devicePath(), SENSOR_TYPE_PROXIMITY, sensor)
+{
+ setDescription(QLatin1String("Distance"));
+}
+
+QString BbDistanceSensor::devicePath()
+{
+ return QLatin1String("/dev/sensor/prox");
+}
+
+bool BbDistanceSensor::updateReadingFromEvent(const sensor_event_t &event, QDistanceReading *reading)
+{
+ reading->setDistance(event.proximity_s.distance);
+ return true;
+}
diff --git a/src/plugins/sensors/blackberry/bbdistancesensor.h b/src/plugins/sensors/blackberry/bbdistancesensor.h
new file mode 100644
index 00000000..c9ea48fe
--- /dev/null
+++ b/src/plugins/sensors/blackberry/bbdistancesensor.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** 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 BBDISTANCESENSOR_H
+#define BBDISTANCESENSOR_H
+
+#include "bbsensorbackend.h"
+#include <qdistancesensor.h>
+
+class BbDistanceSensor : public BbSensorBackend<QDistanceReading>
+{
+ Q_OBJECT
+
+public:
+ explicit BbDistanceSensor(QSensor *sensor);
+
+ static QString devicePath();
+
+protected:
+ bool updateReadingFromEvent(const sensor_event_t &event, QDistanceReading *reading) Q_DECL_OVERRIDE;
+};
+
+#endif
diff --git a/src/plugins/sensors/blackberry/blackberry.pro b/src/plugins/sensors/blackberry/blackberry.pro
index 8095cf16..2b0a9541 100644
--- a/src/plugins/sensors/blackberry/blackberry.pro
+++ b/src/plugins/sensors/blackberry/blackberry.pro
@@ -22,6 +22,7 @@ HEADERS += bbsensorbackend.h \
bbaltimeter.h \
bbambientlightsensor.h \
bbcompass.h \
+ bbdistancesensor.h \
bbgyroscope.h \
bbirproximitysensor.h \
bblightsensor.h \
@@ -39,6 +40,7 @@ SOURCES += bbsensorbackend.cpp \
bbaltimeter.cpp \
bbambientlightsensor.cpp \
bbcompass.cpp \
+ bbdistancesensor.cpp \
bbgyroscope.cpp \
bbirproximitysensor.cpp \
bblightsensor.cpp \
diff --git a/src/plugins/sensors/blackberry/main.cpp b/src/plugins/sensors/blackberry/main.cpp
index 61f9aa08..9037e66b 100644
--- a/src/plugins/sensors/blackberry/main.cpp
+++ b/src/plugins/sensors/blackberry/main.cpp
@@ -54,6 +54,7 @@
#include "bbproximitysensor.h"
#include "bbrotationsensor.h"
#include "bbtemperaturesensor.h"
+#include "bbdistancesensor.h"
#include "bbguihelper.h"
#include <qsensormanager.h>
@@ -75,6 +76,7 @@ static const char *bbPressureSensorId = "bbPressureSensor";
static const char *bbProximitySensorId = "bbProximitySensor";
static const char *bbRotationSensorId = "bbRotationSensor";
static const char *bbTemperatureSensorId = "bbTemperatureSensor";
+static const char *bbDistanceSensorId = "bbDistanceSensor";
class BbSensorPlugin : public QObject, public QSensorPluginInterface, public QSensorBackendFactory
{
@@ -115,6 +117,8 @@ public:
QSensorManager::registerBackend(QRotationSensor::type, bbRotationSensorId, this);
if (sensorSupported(BbTemperatureSensor::devicePath()))
QSensorManager::registerBackend(QAmbientTemperatureSensor::type, bbTemperatureSensorId, this);
+ if (sensorSupported(BbDistanceSensor::devicePath()))
+ QSensorManager::registerBackend(QDistanceSensor::type, bbDistanceSensorId, this);
}
QSensorBackend *createBackend(QSensor *sensor) Q_DECL_OVERRIDE
@@ -150,6 +154,8 @@ public:
backend = new BbRotationSensor(sensor);
if (sensor->identifier() == bbTemperatureSensorId)
backend = new BbTemperatureSensor(sensor);
+ if (sensor->identifier() == bbDistanceSensorId)
+ backend = new BbDistanceSensor(sensor);
backend->initSensorInfo();
backend->setGuiHelper(&m_guiHelper);
return backend;
diff --git a/src/plugins/sensors/generic/genericalssensor.h b/src/plugins/sensors/generic/genericalssensor.h
index 1ed6e76e..f9066522 100644
--- a/src/plugins/sensors/generic/genericalssensor.h
+++ b/src/plugins/sensors/generic/genericalssensor.h
@@ -42,9 +42,9 @@
#ifndef GENERICALSSENSOR_H
#define GENERICALSSENSOR_H
-#include <qsensorbackend.h>
-#include <qlightsensor.h>
-#include <qambientlightsensor.h>
+#include <QtSensors/qsensorbackend.h>
+#include <QtSensors/qlightsensor.h>
+#include <QtSensors/qambientlightsensor.h>
class genericalssensor : public QSensorBackend, public QLightFilter
{
diff --git a/src/plugins/sensors/generic/genericorientationsensor.h b/src/plugins/sensors/generic/genericorientationsensor.h
index d1e7d343..95ec4ab8 100644
--- a/src/plugins/sensors/generic/genericorientationsensor.h
+++ b/src/plugins/sensors/generic/genericorientationsensor.h
@@ -42,9 +42,9 @@
#ifndef GENERICORIENTATIONSENSOR_H
#define GENERICORIENTATIONSENSOR_H
-#include <qsensorbackend.h>
-#include <qorientationsensor.h>
-#include <qaccelerometer.h>
+#include <QtSensors/qsensorbackend.h>
+#include <QtSensors/qorientationsensor.h>
+#include <QtSensors/qaccelerometer.h>
class genericorientationsensor : public QSensorBackend, public QAccelerometerFilter
{
diff --git a/src/plugins/sensors/generic/genericrotationsensor.h b/src/plugins/sensors/generic/genericrotationsensor.h
index 693528fa..6b86eeae 100644
--- a/src/plugins/sensors/generic/genericrotationsensor.h
+++ b/src/plugins/sensors/generic/genericrotationsensor.h
@@ -42,10 +42,10 @@
#ifndef GENERICROTATIONSENSOR_H
#define GENERICROTATIONSENSOR_H
-#include <qsensorbackend.h>
-#include <qrotationsensor.h>
-#include <qaccelerometer.h>
-#include <qmagnetometer.h>
+#include <QtSensors/qsensorbackend.h>
+#include <QtSensors/qrotationsensor.h>
+#include <QtSensors/qaccelerometer.h>
+#include <QtSensors/qmagnetometer.h>
class genericrotationsensor : public QSensorBackend, public QSensorFilter
{
diff --git a/src/plugins/sensors/generic/generictiltsensor.h b/src/plugins/sensors/generic/generictiltsensor.h
index f62c1f58..d781728f 100644
--- a/src/plugins/sensors/generic/generictiltsensor.h
+++ b/src/plugins/sensors/generic/generictiltsensor.h
@@ -42,9 +42,9 @@
#ifndef GENERICTILTSENSOR_H
#define GENERICTILTSENSOR_H
-#include <qsensorbackend.h>
-#include <qtiltsensor.h>
-#include <qaccelerometer.h>
+#include <QtSensors/qsensorbackend.h>
+#include <QtSensors/qtiltsensor.h>
+#include <QtSensors/qaccelerometer.h>
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/sensors/generic/main.cpp b/src/plugins/sensors/generic/main.cpp
index aa9f58c2..dcaa4988 100644
--- a/src/plugins/sensors/generic/main.cpp
+++ b/src/plugins/sensors/generic/main.cpp
@@ -51,9 +51,9 @@
#ifdef QTSENSORS_GENERICTILTSENSOR
#include "generictiltsensor.h"
#endif
-#include <qsensorplugin.h>
-#include <qsensorbackend.h>
-#include <qsensormanager.h>
+#include <QtSensors/qsensorplugin.h>
+#include <QtSensors/qsensorbackend.h>
+#include <QtSensors/qsensormanager.h>
#include <QFile>
#include <QDebug>
diff --git a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp
index d98dfd1a..76ce38d6 100644
--- a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp
+++ b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp
@@ -42,12 +42,12 @@
#include "sensorfwproximitysensor.h"
char const * const SensorfwProximitySensor::id("sensorfw.proximitysensor");
-//bool SensorfwProximitySensor::m_initDone = false;
SensorfwProximitySensor::SensorfwProximitySensor(QSensor *sensor)
: SensorfwSensorBase(sensor),
- m_exClose(false)
- , m_initDone(false)
+ m_exClose(false),
+ m_initDone(false),
+ firstRun(true)
{
init();
setReading<QProximityReading>(&m_reading);
@@ -57,12 +57,6 @@ SensorfwProximitySensor::SensorfwProximitySensor(QSensor *sensor)
void SensorfwProximitySensor::start()
{
- if (m_sensorInterface) {
- Unsigned data(((ProximitySensorChannelInterface*)m_sensorInterface)->proximity());
- m_reading.setClose(data.x()? true: false);
- m_reading.setTimestamp(data.UnsignedData().timestamp_);
- newReadingAvailable();
- }
SensorfwSensorBase::start();
}
@@ -70,11 +64,13 @@ void SensorfwProximitySensor::start()
void SensorfwProximitySensor::slotDataAvailable(const Unsigned& data)
{
bool close = data.x()? true: false;
- if (close == m_exClose) return;
+ if (!firstRun && close == m_exClose) return;
m_reading.setClose(close);
m_reading.setTimestamp(data.UnsignedData().timestamp_);
newReadingAvailable();
m_exClose = close;
+ if (firstRun)
+ firstRun = false;
}
bool SensorfwProximitySensor::doConnect()
diff --git a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h
index caaa9b97..a9352fb7 100644
--- a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h
+++ b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h
@@ -66,6 +66,7 @@ private:
QProximityReading m_reading;
bool m_initDone;
bool m_exClose;
+ bool firstRun;
private slots:
void slotDataAvailable(const Unsigned& data);
diff --git a/src/sensors/doc/qtsensors.qdocconf b/src/sensors/doc/qtsensors.qdocconf
index 3fb33d93..b105040c 100644
--- a/src/sensors/doc/qtsensors.qdocconf
+++ b/src/sensors/doc/qtsensors.qdocconf
@@ -27,7 +27,7 @@ qhp.QtSensors.subprojects.classes.selectors = class fake:headerfile
qhp.QtSensors.subprojects.classes.sortPages = true
qhp.QtSensors.subprojects.qmltypes.title = QML Types
qhp.QtSensors.subprojects.qmltypes.indexTitle = Qt Sensors QML Types
-qhp.QtSensors.subprojects.qmltypes.selectors = fake:qmlclass
+qhp.QtSensors.subprojects.qmltypes.selectors = qmlclass
qhp.QtSensors.subprojects.qmltypes.sortPages = true
qhp.QtSensors.subprojects.examples.title = Examples
qhp.QtSensors.subprojects.examples.indexTitle = Qt Sensors Examples
diff --git a/src/sensors/doc/src/compatmap.qdoc b/src/sensors/doc/src/compatmap.qdoc
index 622069bb..db9d66ca 100644
--- a/src/sensors/doc/src/compatmap.qdoc
+++ b/src/sensors/doc/src/compatmap.qdoc
@@ -118,6 +118,17 @@
<td bgcolor="green"></td>
</tr>
<tr>
+ <td nowrap="nowrap">Distance</td>
+ <td bgcolor="green"></td>
+ <td bgcolor="gray"></td>
+ <td bgcolor="gray"></td>
+ <td bgcolor="gray"></td>
+ <td bgcolor="gray"></td>
+ <td bgcolor="gray"></td>
+ <td bgcolor="gray"></td>
+ <td bgcolor="gray"></td>
+ </tr>
+ <tr>
<td nowrap="nowrap">Gyroscope</td>
<td bgcolor="green"></td>
<td bgcolor="green"></td>
diff --git a/src/sensors/qdistancesensor.cpp b/src/sensors/qdistancesensor.cpp
new file mode 100644
index 00000000..3cec9ca9
--- /dev/null
+++ b/src/sensors/qdistancesensor.cpp
@@ -0,0 +1,164 @@
+ /****************************************************************************
+ **
+ ** 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 <qdistancesensor.h>
+#include "qdistancesensor_p.h"
+
+QT_BEGIN_NAMESPACE
+
+IMPLEMENT_READING(QDistanceReading)
+
+/*!
+ \class QDistanceReading
+ \ingroup sensors_reading
+ \inmodule QtSensors
+ \since 5.4
+
+ \brief The QDistanceReading class holds distance reading in cm from the proximity sensor.
+
+ The QDistanceReading class holds distance reading in cm from the proximity sensor.
+ Note: Some proximity sensor only support two values for distance, a near and far value.
+ In this case, the sensor should report its maximum range value to represent the far state,
+ and a lesser value to represent the near state.
+
+ \section2 QDistanceReading Units
+ The distance is measured in cm
+
+ The distance sensor is typically located in the front face of a device, and thus will
+ measure the distance of an object from the device's front face.
+*/
+
+/*!
+ \property QDistanceReading::distance
+ \brief distance of object from front face of device
+
+ \sa {QDistanceReading Units}
+*/
+
+qreal QDistanceReading::distance() const
+{
+ return d->distance;
+}
+
+/*!
+ Sets distance to \a distance.
+*/
+void QDistanceReading::setDistance(qreal distance)
+{
+ d->distance = distance;
+}
+
+// =====================================================================
+
+/*!
+ \class QDistanceFilter
+ \ingroup sensors_filter
+ \inmodule QtSensors
+ \since 5.4
+
+ \brief The QDistanceFilter class is a convenience wrapper around QSensorFilter.
+
+ The only difference is that the filter() method features a pointer to QDistanceReading
+ instead of QSensorReading.
+*/
+
+/*!
+ \fn QDistanceFilter::filter(QDistanceReading *reading)
+
+ Called when \a reading changes. Returns false to prevent the reading from propagating.
+
+ \sa QSensorFilter::filter()
+*/
+
+bool QDistanceFilter::filter(QSensorReading *reading)
+{
+ return filter(static_cast<QDistanceReading*>(reading));
+}
+
+char const * const QDistanceSensor::type("QDistanceSensor");
+
+/*!
+ \class QDistanceSensor
+ \ingroup sensors_type
+ \inmodule QtSensors
+ \since 5.4
+
+ \brief The QDistanceSensor class is a convenience wrapper around QSensor.
+
+ The only behavioral difference is that this class sets the type properly.
+
+ This class also features a reading() function that returns a QDistanceReading instead of a QSensorReading.
+
+ For details about how the sensor works, see \l QDistanceReading.
+
+ \sa QDistanceReading
+*/
+
+/*!
+ Construct the sensor as a child of \a parent.
+*/
+QDistanceSensor::QDistanceSensor(QObject *parent)
+ : QSensor(QDistanceSensor::type, parent)
+{
+}
+
+/*!
+ Destroy the sensor. Stops the sensor if it has not already been stopped.
+*/
+QDistanceSensor::~QDistanceSensor()
+{
+}
+
+/*!
+ \fn QDistanceSensor::reading() const
+
+ Returns the reading class for this sensor.
+
+ \sa QSensor::reading()
+*/
+
+QDistanceReading *QDistanceSensor::reading() const
+{
+ return static_cast<QDistanceReading*>(QSensor::reading());
+}
+
+#include "moc_qdistancesensor.cpp"
+QT_END_NAMESPACE
diff --git a/src/sensors/qdistancesensor.h b/src/sensors/qdistancesensor.h
new file mode 100644
index 00000000..0014d6fb
--- /dev/null
+++ b/src/sensors/qdistancesensor.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** 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 QDISTANCESENSOR_H
+#define QDISTANCESENSOR_H
+
+#include <QtSensors/qsensor.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDistanceReadingPrivate;
+
+class Q_SENSORS_EXPORT QDistanceReading : public QSensorReading
+{
+ Q_OBJECT
+ Q_PROPERTY(qreal distance READ distance)
+ DECLARE_READING(QDistanceReading)
+public:
+ qreal distance() const;
+ void setDistance(qreal distance);
+};
+
+class Q_SENSORS_EXPORT QDistanceFilter : public QSensorFilter
+{
+public:
+ virtual bool filter(QDistanceReading *reading) = 0;
+private:
+ bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+};
+
+class Q_SENSORS_EXPORT QDistanceSensor : public QSensor
+{
+ Q_OBJECT
+public:
+ explicit QDistanceSensor(QObject *parent = 0);
+ ~QDistanceSensor();
+ QDistanceReading *reading() const;
+ static char const * const type;
+
+private:
+ Q_DISABLE_COPY(QDistanceSensor)
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/sensors/qdistancesensor_p.h b/src/sensors/qdistancesensor_p.h
new file mode 100644
index 00000000..2bbb8955
--- /dev/null
+++ b/src/sensors/qdistancesensor_p.h
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** 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 QDISTANCESENSOR_P_H
+#define QDISTANCESENSOR_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.
+//
+
+QT_BEGIN_NAMESPACE
+
+class QDistanceReadingPrivate
+{
+public:
+ QDistanceReadingPrivate()
+ : distance(0.0)
+ {
+ }
+
+ /*
+ * Note that this class is copied so you may need to implement
+ * a copy constructor if you have complex types or pointers
+ * as values.
+ */
+
+ qreal distance;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro
index 13e83151..a7f60e18 100644
--- a/src/sensors/sensors.pro
+++ b/src/sensors/sensors.pro
@@ -35,7 +35,7 @@ PRIVATE_HEADERS += \
SOURCES += qsensorbackend.cpp\
qsensormanager.cpp\
- qsensorplugin.cpp\
+ qsensorplugin.cpp
SOURCES += \
gestures/qsensorgesture.cpp \
@@ -65,6 +65,7 @@ SENSORS=\
qambientlightsensor\
qambienttemperaturesensor\
qcompass\
+ qdistancesensor\
qholstersensor\
qlightsensor\
qmagnetometer\
@@ -75,7 +76,7 @@ SENSORS=\
qtapsensor\
qtiltsensor\
qgyroscope\
- qpressuresensor\
+ qpressuresensor
for(s,SENSORS) {
# Client API
diff --git a/tests/auto/qsensor/tst_qsensor.cpp b/tests/auto/qsensor/tst_qsensor.cpp
index ce5f8e36..72b30d4e 100644
--- a/tests/auto/qsensor/tst_qsensor.cpp
+++ b/tests/auto/qsensor/tst_qsensor.cpp
@@ -221,7 +221,7 @@ private slots:
QByteArray actual = sensor.identifier();
QCOMPARE(actual, expected);
- QTest::ignoreMessage(QtWarningMsg, "ERROR: Cannot call QSensor::setIdentifier while connected to a backend! ");
+ QTest::ignoreMessage(QtWarningMsg, "ERROR: Cannot call QSensor::setIdentifier while connected to a backend!");
sensor.setIdentifier("dummy.accelerometer");
expected = testsensorimpl::id;
actual = sensor.identifier();
@@ -232,7 +232,7 @@ private slots:
{
QSensorManager::setDefaultBackend(QByteArray(TestSensor::type), QByteArray("test sensor 2"));
TestSensor sensor;
- QTest::ignoreMessage(QtWarningMsg, "Can't create backend \"test sensor 2\" ");
+ QTest::ignoreMessage(QtWarningMsg, "Can't create backend \"test sensor 2\"");
sensor.connectToBackend();
QByteArray expected = testsensorimpl::id;
QByteArray actual = sensor.identifier();
@@ -378,14 +378,14 @@ private slots:
{
TestSensor sensor;
sensor.setProperty("doThis", "rates(0)");
- QTest::ignoreMessage(QtWarningMsg, "ERROR: Cannot call QSensorBackend::setDataRates with 0 ");
+ QTest::ignoreMessage(QtWarningMsg, "ERROR: Cannot call QSensorBackend::setDataRates with 0");
sensor.connectToBackend();
}
{
TestSensor sensor;
sensor.setProperty("doThis", "rates(nodef)");
- QTest::ignoreMessage(QtWarningMsg, "ERROR: Cannot call QSensorBackend::setDataRates with an invalid sensor ");
+ QTest::ignoreMessage(QtWarningMsg, "ERROR: Cannot call QSensorBackend::setDataRates with an invalid sensor");
sensor.connectToBackend();
}
@@ -417,10 +417,10 @@ private slots:
QList<QSensorFilter*> expected = QList<QSensorFilter*>();
QCOMPARE(actual, expected);
- QTest::ignoreMessage(QtWarningMsg, "addFilter: passed a null filter! ");
+ QTest::ignoreMessage(QtWarningMsg, "addFilter: passed a null filter!");
sensor.addFilter(0);
- QTest::ignoreMessage(QtWarningMsg, "removeFilter: passed a null filter! ");
+ QTest::ignoreMessage(QtWarningMsg, "removeFilter: passed a null filter!");
sensor.removeFilter(0);
MyFilter *filter = new MyFilter;
@@ -559,7 +559,7 @@ private slots:
sensor.setOutputRange(-1);
QCOMPARE(sensor.outputRange(), -1);
- QTest::ignoreMessage(QtWarningMsg, "setOutputRange: 300 is not supported by the sensor. ");
+ QTest::ignoreMessage(QtWarningMsg, "setOutputRange: 300 is not supported by the sensor.");
sensor.setOutputRange(300);
QCOMPARE(sensor.outputRange(), -1);
}
@@ -570,10 +570,10 @@ private slots:
sensor.setOutputRange(300);
QCOMPARE(sensor.outputRange(), 300);
sensor.setOutputRange(350);
- QTest::ignoreMessage(QtWarningMsg, "setOutputRange: 350 is not supported by the sensor. ");
+ QTest::ignoreMessage(QtWarningMsg, "setOutputRange: 350 is not supported by the sensor.");
sensor.connectToBackend();
QCOMPARE(sensor.outputRange(), -1);
- QTest::ignoreMessage(QtWarningMsg, "setOutputRange: -2 is not supported by the sensor. ");
+ QTest::ignoreMessage(QtWarningMsg, "setOutputRange: -2 is not supported by the sensor.");
sensor.setOutputRange(-2);
QCOMPARE(sensor.outputRange(), -1);
}
@@ -737,12 +737,12 @@ private slots:
QSensorManager::registerBackend("random", "random.2", &factory);
QSensor random("random");
// This is a sensorlog, not a warning
- //QTest::ignoreMessage(QtWarningMsg, "no suitable backend found for requested identifier \"\" and type \"random\" ");
+ //QTest::ignoreMessage(QtWarningMsg, "no suitable backend found for requested identifier \"\" and type \"random\"");
random.connectToBackend();
QVERIFY(!random.isConnectedToBackend());
random.setIdentifier("random.3");
// This is a sensorlog, not a warning
- //QTest::ignoreMessage(QtWarningMsg, "no backend with identifier \"random.3\" for type \"random\" ");
+ //QTest::ignoreMessage(QtWarningMsg, "no backend with identifier \"random.3\" for type \"random\"");
random.connectToBackend();
QVERIFY(!random.isConnectedToBackend());
random.setIdentifier("random.1");
@@ -764,7 +764,7 @@ private slots:
// Register it again (creates a warning)
sensor.sensorsChangedEmitted = 0;
- QTest::ignoreMessage(QtWarningMsg, "A backend with type \"a random type\" and identifier \"a random id\" has already been registered! ");
+ QTest::ignoreMessage(QtWarningMsg, "A backend with type \"a random type\" and identifier \"a random id\" has already been registered!");
QSensorManager::registerBackend("a random type", "a random id", &factory);
QCOMPARE(sensor.sensorsChangedEmitted, 0);
@@ -775,13 +775,13 @@ private slots:
// Unregister an unknown identifier
sensor.sensorsChangedEmitted = 0;
- QTest::ignoreMessage(QtWarningMsg, "Identifier \"a random id\" is not registered ");
+ QTest::ignoreMessage(QtWarningMsg, "Identifier \"a random id\" is not registered");
QSensorManager::unregisterBackend(TestSensor::type, "a random id");
QCOMPARE(sensor.sensorsChangedEmitted, 0);
// Unregister for an unknown type
sensor.sensorsChangedEmitted = 0;
- QTest::ignoreMessage(QtWarningMsg, "No backends of type \"foo\" are registered ");
+ QTest::ignoreMessage(QtWarningMsg, "No backends of type \"foo\" are registered");
QSensorManager::unregisterBackend("foo", "bar");
QCOMPARE(sensor.sensorsChangedEmitted, 0);
diff --git a/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp b/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp
index da1d1f56..6aa6d47e 100644
--- a/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp
+++ b/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp
@@ -85,11 +85,11 @@ void Tst_qsensorgesturePluginsTest::tst_sensor_plugins_shake()
QCOMPARE(recognizer->isActive(), false);
- QTest::ignoreMessage(QtWarningMsg, "Not starting. Gesture Recognizer not initialized ");
+ QTest::ignoreMessage(QtWarningMsg, "Not starting. Gesture Recognizer not initialized");
recognizer->startBackend();
QCOMPARE(recognizer->isActive(), false);
- QTest::ignoreMessage(QtWarningMsg, "Not stopping. Gesture Recognizer not initialized ");
+ QTest::ignoreMessage(QtWarningMsg, "Not stopping. Gesture Recognizer not initialized");
recognizer->stopBackend();
QCOMPARE(recognizer->isActive(), false);
diff --git a/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp b/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp
index 86854293..0ca654a0 100644
--- a/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp
+++ b/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp
@@ -160,13 +160,13 @@ void Tst_qsensorgestureTest::tst_recognizer_dup()
{
QStringList idList;
{
-// QTest::ignoreMessage(QtWarningMsg, "\"QtSensors.test.dup\" from the plugin \"TestGesturesDup\" is already known. ");
+// QTest::ignoreMessage(QtWarningMsg, "\"QtSensors.test.dup\" from the plugin \"TestGesturesDup\" is already known.");
QSensorGestureManager manager;
idList = manager.gestureIds();
for (int i = 0; i < idList.count(); i++) {
if (idList.at(i) == "QtSensors.test.dup")
- QTest::ignoreMessage(QtWarningMsg, "Ignoring recognizer \"QtSensors.test.dup\" from plugin \"TestGesturesDup\" because it is already registered ");
+ QTest::ignoreMessage(QtWarningMsg, "Ignoring recognizer \"QtSensors.test.dup\" from plugin \"TestGesturesDup\" because it is already registered");
QStringList recognizerSignalsList = manager.recognizerSignals(idList.at(i));
QVERIFY(!recognizerSignalsList.contains("QtSensors.test2"));
@@ -253,7 +253,7 @@ void Tst_qsensorgestureTest::tst_manager_registerSensorGestureRecognizer()
QCOMPARE(num+1, manager.gestureIds().count());
recognizer = new QTest3Recognizer;
-// QTest::ignoreMessage(QtWarningMsg, "\"QtSensors/test3\" is already known ");
+// QTest::ignoreMessage(QtWarningMsg, "\"QtSensors/test3\" is already known");
ok = manager.registerSensorGestureRecognizer(recognizer);
QCOMPARE(ok, false);
QCOMPARE(num+1, manager.gestureIds().count());
@@ -280,7 +280,7 @@ void Tst_qsensorgestureTest::tst_manager__newSensorAvailable()
recognizer = new QTest3Recognizer;
recognizer->changeId("QtSensors.test4");
-// QTest::ignoreMessage(QtWarningMsg, "\"QtSensors.test4\" is already known ");
+// QTest::ignoreMessage(QtWarningMsg, "\"QtSensors.test4\" is already known");
ok = manager.registerSensorGestureRecognizer(recognizer);
QCOMPARE(ok, false);
QCOMPARE(spy_manager_available.count(),1);
@@ -605,15 +605,15 @@ void Tst_qsensorgestureTest::shakeDetected(const QString &type)
void Tst_qsensorgestureTest::tst_sensor_gesture_notinitialized()
{
- QTest::ignoreMessage(QtWarningMsg, "\"QtSensors.test.dup\" from the plugin \"TestGesturesDup\" is already known. ");
+ QTest::ignoreMessage(QtWarningMsg, "\"QtSensors.test.dup\" from the plugin \"TestGesturesDup\" is already known.");
QSensorGestureManager manager;
QSensorGestureRecognizer *recognizer = manager.sensorGestureRecognizer("QtSensors.test");
- QTest::ignoreMessage(QtWarningMsg, "Not starting. Gesture Recognizer not initialized ");
+ QTest::ignoreMessage(QtWarningMsg, "Not starting. Gesture Recognizer not initialized");
recognizer->startBackend();
QVERIFY(recognizer->isActive() == false);
- QTest::ignoreMessage(QtWarningMsg, "Not stopping. Gesture Recognizer not initialized ");
+ QTest::ignoreMessage(QtWarningMsg, "Not stopping. Gesture Recognizer not initialized");
recognizer->stopBackend();
QVERIFY(recognizer->isActive() == false);