summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.qmake.conf2
-rw-r--r--dist/changes-5.9.026
-rw-r--r--src/imports/sensors/qmlhumiditysensor.cpp150
-rw-r--r--src/imports/sensors/qmlhumiditysensor.h90
-rw-r--r--src/imports/sensors/qmllidsensor.cpp149
-rw-r--r--src/imports/sensors/qmllidsensor.h88
-rw-r--r--src/imports/sensors/sensors.cpp11
-rw-r--r--src/imports/sensors/sensors.pro8
-rw-r--r--src/plugins/sensors/sensorfw/Sensors.conf1
-rw-r--r--src/plugins/sensors/sensorfw/main.cpp3
-rw-r--r--src/plugins/sensors/sensorfw/sensorfw.pri4
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwlidsensor.cpp91
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwlidsensor.h70
-rw-r--r--src/sensors/doc/src/compatmap.qdoc20
-rw-r--r--src/sensors/qhumiditysensor.cpp181
-rw-r--r--src/sensors/qhumiditysensor.h91
-rw-r--r--src/sensors/qhumiditysensor_p.h82
-rw-r--r--src/sensors/qlidsensor.cpp182
-rw-r--r--src/sensors/qlidsensor.h90
-rw-r--r--src/sensors/qlidsensor_p.h69
-rw-r--r--src/sensors/sensors.pro4
21 files changed, 1404 insertions, 8 deletions
diff --git a/.qmake.conf b/.qmake.conf
index aefa1e70..b1c22d3b 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.8.0
+MODULE_VERSION = 5.9.0
diff --git a/dist/changes-5.9.0 b/dist/changes-5.9.0
new file mode 100644
index 00000000..e536cd28
--- /dev/null
+++ b/dist/changes-5.9.0
@@ -0,0 +1,26 @@
+Qt 5.9 introduces many new features and improvements as well as bugfixes
+over the 5.8.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+ http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+ https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Library *
+****************************************************************************
+
+QtSensors
+---------
+
+ - Added QLidSensor
+ - Added sensorfw backend for QLidSensor
diff --git a/src/imports/sensors/qmlhumiditysensor.cpp b/src/imports/sensors/qmlhumiditysensor.cpp
new file mode 100644
index 00000000..3b30e972
--- /dev/null
+++ b/src/imports/sensors/qmlhumiditysensor.cpp
@@ -0,0 +1,150 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Canonical 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$
+**
+****************************************************************************/
+
+#include "qmlhumiditysensor.h"
+#include <QtSensors/QHumiditySensor>
+
+/*!
+ \qmltype HumiditySensor
+ \instantiates QmlHumiditySensor
+ \ingroup qml-sensors_type
+ \inqmlmodule QtSensors
+ \since QtSensors 5.9
+ \inherits Sensor
+ \brief The HumiditySensor element reports on humidity.
+
+ The HumiditySensor element reports on humidity.
+
+ This element wraps the QHumiditySensor class. Please see the documentation for
+ QHumiditySensor for details.
+
+ \sa HumidityReading
+*/
+
+QmlHumiditySensor::QmlHumiditySensor(QObject *parent)
+ : QmlSensor(parent)
+ , m_sensor(new QHumiditySensor(this))
+{
+}
+
+QmlHumiditySensor::~QmlHumiditySensor()
+{
+}
+
+QmlSensorReading *QmlHumiditySensor::createReading() const
+{
+ return new QmlHumidityReading(m_sensor);
+}
+
+QSensor *QmlHumiditySensor::sensor() const
+{
+ return m_sensor;
+}
+
+/*!
+ \qmltype HumidityReading
+ \instantiates QmlHumidityReading
+ \ingroup qml-sensors_reading
+ \inqmlmodule QtSensors
+ \since QtSensors 5.9
+ \inherits SensorReading
+ \brief The HumidityReading element holds the most recent HumiditySensor reading.
+
+ The HumidityReading element holds the most recent HumiditySensor reading.
+
+ This element wraps the QHumidityReading class. Please see the documentation for
+ QHumidityReading for details.
+
+ This element cannot be directly created.
+*/
+
+QmlHumidityReading::QmlHumidityReading(QHumiditySensor *sensor)
+ : QmlSensorReading(sensor)
+ , m_sensor(sensor)
+ , m_relativeHumidity(0)
+ , m_absoluteHumidity(0)
+{
+}
+
+QmlHumidityReading::~QmlHumidityReading()
+{
+}
+
+/*!
+ \qmlproperty qreal HumidityReading::relativeHumidity
+ This property holds the relative humidity as a percentage.
+
+ Please see QHumidityReading::relativeHumidity for information about this property.
+*/
+
+qreal QmlHumidityReading::relativeHumidity() const
+{
+ return m_relativeHumidity;
+}
+
+/*!
+ \qmlproperty qreal HumidityReading::absoluteHumidity
+ This property holds the absolute humidity in grams per cubic meter (g/m3).
+
+ Please see QHumidityReading::absoluteHumidity for information about this property.
+*/
+
+qreal QmlHumidityReading::absoluteHumidity() const
+{
+ return m_absoluteHumidity;
+}
+
+QSensorReading *QmlHumidityReading::reading() const
+{
+ return m_sensor->reading();
+}
+
+void QmlHumidityReading::readingUpdate()
+{
+ qreal humidity = m_sensor->reading()->relativeHumidity();
+ if (m_relativeHumidity != humidity) {
+ m_relativeHumidity = humidity;
+ Q_EMIT relativeHumidityChanged();
+ }
+ qreal abs = m_sensor->reading()->absoluteHumidity();
+ if (m_absoluteHumidity != abs) {
+ m_absoluteHumidity = abs;
+ Q_EMIT absoluteHumidityChanged();
+ }
+}
diff --git a/src/imports/sensors/qmlhumiditysensor.h b/src/imports/sensors/qmlhumiditysensor.h
new file mode 100644
index 00000000..9fc54ac1
--- /dev/null
+++ b/src/imports/sensors/qmlhumiditysensor.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Canonical 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 QMLHUMIDITYSENSOR_H
+#define QMLHUMIDITYSENSOR_H
+
+#include "qmlsensor.h"
+
+QT_BEGIN_NAMESPACE
+
+class QHumiditySensor;
+
+class QmlHumiditySensor : public QmlSensor
+{
+ Q_OBJECT
+
+public:
+ explicit QmlHumiditySensor(QObject *parent = Q_NULLPTR);
+ ~QmlHumiditySensor();
+
+private:
+ QSensor *sensor() const Q_DECL_OVERRIDE;
+ QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+
+ QHumiditySensor *m_sensor;
+};
+
+class QmlHumidityReading : public QmlSensorReading
+{
+ Q_OBJECT
+ Q_PROPERTY(qreal relativeHumidity READ relativeHumidity NOTIFY relativeHumidityChanged)
+ Q_PROPERTY(qreal absoluteHumidity READ absoluteHumidity NOTIFY absoluteHumidityChanged)
+public:
+ explicit QmlHumidityReading(QHumiditySensor *sensor);
+ ~QmlHumidityReading();
+
+ qreal relativeHumidity() const;
+ qreal absoluteHumidity() const;
+
+Q_SIGNALS:
+ void relativeHumidityChanged();
+ void absoluteHumidityChanged();
+
+private:
+ QSensorReading *reading() const Q_DECL_OVERRIDE;
+ void readingUpdate() Q_DECL_OVERRIDE;
+
+ QHumiditySensor *m_sensor;
+ qreal m_relativeHumidity;
+ qreal m_absoluteHumidity;
+};
+
+QT_END_NAMESPACE
+#endif
diff --git a/src/imports/sensors/qmllidsensor.cpp b/src/imports/sensors/qmllidsensor.cpp
new file mode 100644
index 00000000..e6dfa4cb
--- /dev/null
+++ b/src/imports/sensors/qmllidsensor.cpp
@@ -0,0 +1,149 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Canonical, 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$
+**
+****************************************************************************/
+#include "qmllidsensor.h"
+#include <QtSensors/QLidSensor>
+
+/*!
+ \qmltype LidSensor
+ \instantiates QmlLidSensor
+ \ingroup qml-sensors_type
+ \inqmlmodule QtSensors
+ \since QtSensors 5.9
+ \inherits Sensor
+ \brief The LidSensor element reports on whether a device is closed.
+
+ The LidSensor element reports on whether a device is closed.
+
+ This element wraps the QLidSensor class. Please see the documentation for
+ QLidSensor for details.
+
+ \sa LidReading
+*/
+
+QmlLidSensor::QmlLidSensor(QObject *parent)
+ : QmlSensor(parent)
+ , m_sensor(new QLidSensor(this))
+{
+}
+
+QmlLidSensor::~QmlLidSensor()
+{
+}
+
+QmlSensorReading *QmlLidSensor::createReading() const
+{
+ return new QmlLidReading(m_sensor);
+}
+
+QSensor *QmlLidSensor::sensor() const
+{
+ return m_sensor;
+}
+
+/*!
+ \qmltype LidReading
+ \instantiates QmlLidReading
+ \ingroup qml-sensors_reading
+ \inqmlmodule QtSensors
+ \since QtSensors 5.9
+ \inherits SensorReading
+ \brief The LidReading element holds the most recent LidSensor reading.
+
+ The LidReading element holds the most recent LidSensor reading.
+
+ This element wraps the QLidReading class. Please see the documentation for
+ QLidReading for details.
+
+ This element cannot be directly created.
+*/
+
+QmlLidReading::QmlLidReading(QLidSensor *sensor)
+ : QmlSensorReading(sensor)
+ , m_sensor(sensor)
+ , m_backClosed(false)
+ , m_frontClosed(true)
+{
+}
+
+QmlLidReading::~QmlLidReading()
+{
+}
+
+/*!
+ \qmlproperty qreal LidReading::backLidClosed
+ This property holds whether the back lid is closed.
+
+ Please see QLidReading::backLidClosed for information about this property.
+*/
+
+bool QmlLidReading::backLidChanged() const
+{
+ return m_backClosed;
+}
+
+/*!
+ \qmlproperty qreal LidReading::frontLidClosed
+ This property holds whether the front lid is closed.
+
+ Please see QLidReading::frontLidClosed for information about this property.
+*/
+
+bool QmlLidReading::frontLidClosed() const
+{
+ return m_frontClosed;
+}
+
+QSensorReading *QmlLidReading::reading() const
+{
+ return m_sensor->reading();
+}
+
+void QmlLidReading::readingUpdate()
+{
+ const bool backClosed = m_sensor->reading()->backLidClosed();
+ if (m_backClosed != backClosed) {
+ m_backClosed = backClosed;
+ Q_EMIT backLidChanged(m_backClosed);
+ }
+ const bool frontClosed = m_sensor->reading()->frontLidClosed();
+ if (m_frontClosed != frontClosed) {
+ m_frontClosed = frontClosed;
+ Q_EMIT frontLidChanged(m_frontClosed);
+ }
+}
diff --git a/src/imports/sensors/qmllidsensor.h b/src/imports/sensors/qmllidsensor.h
new file mode 100644
index 00000000..caa44ef4
--- /dev/null
+++ b/src/imports/sensors/qmllidsensor.h
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Canonical, 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 QMLLIDSENSOR_H
+#define QMLLIDSENSOR_H
+
+#include "qmlsensor.h"
+
+QT_BEGIN_NAMESPACE
+
+class QLidSensor;
+
+class QmlLidSensor : public QmlSensor
+{
+ Q_OBJECT
+public:
+ explicit QmlLidSensor(QObject *parent = 0);
+ ~QmlLidSensor();
+
+private:
+ QSensor *sensor() const Q_DECL_OVERRIDE;
+ QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+
+ QLidSensor *m_sensor;
+};
+
+class QmlLidReading : public QmlSensorReading
+{
+ Q_OBJECT
+ Q_PROPERTY(bool backLidChanged READ backLidChanged NOTIFY backLidChanged)
+ Q_PROPERTY(bool frontLidClosed READ frontLidClosed NOTIFY frontLidChanged)
+public:
+ explicit QmlLidReading(QLidSensor *sensor);
+ ~QmlLidReading();
+
+ bool backLidChanged() const;
+ bool frontLidClosed() const;
+
+Q_SIGNALS:
+ void backLidChanged(bool closed);
+ bool frontLidChanged(bool closed);
+
+private:
+ QSensorReading *reading() const Q_DECL_OVERRIDE;
+ void readingUpdate() Q_DECL_OVERRIDE;
+
+ QLidSensor *m_sensor;
+ bool m_backClosed;
+ bool m_frontClosed;
+};
+
+QT_END_NAMESPACE
+#endif
diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp
index d1f5bb48..fa8c8e29 100644
--- a/src/imports/sensors/sensors.cpp
+++ b/src/imports/sensors/sensors.cpp
@@ -55,6 +55,7 @@
#include <QtSensors/qgyroscope.h>
#include <QtSensors/qirproximitysensor.h>
#include <QtSensors/qtiltsensor.h>
+#include <QtSensors/qlidsensor.h>
#include "qmlsensorglobal.h"
#include "qmlsensor.h"
@@ -75,6 +76,7 @@
#include "qmltapsensor.h"
#include "qmltiltsensor.h"
#include "qmlsensorgesture.h"
+#include "qmllidsensor.h"
static void initResources()
{
@@ -222,11 +224,14 @@ public:
qmlRegisterType <QmlSensorGesture >(package, major, minor, "SensorGesture");
- // Register the 5.7 interfaces
- // No API changes, just reintroduce existing interfaces from 5.2
- // Implicitly registers 5.3 - 5.6 too
minor = 7;
qmlRegisterType <QmlAltimeter >(package, major, minor, "Altimeter");
+ // Register the 5.9 interfaces
+ // No API changes, just reintroduce existing interfaces from 5.2
+ // Implicitly registers 5.3 - 5.7 too
+ minor = 9;
+ qmlRegisterType <QmlLidSensor >(package, major, minor, "LidSensor");
+ qmlRegisterUncreatableType<QmlLidReading >(package, major, minor, "LidReading", QLatin1String("Cannot create LidReading"));
}
};
diff --git a/src/imports/sensors/sensors.pro b/src/imports/sensors/sensors.pro
index bf33f238..d6279168 100644
--- a/src/imports/sensors/sensors.pro
+++ b/src/imports/sensors/sensors.pro
@@ -21,7 +21,9 @@ HEADERS += \
qmlrotationsensor.h \
qmlsensorglobal.h \
qmltiltsensor.h \
- qmlsensorgesture.h
+ qmlsensorgesture.h \
+ qmlhumiditysensor.h \
+ qmllidsensor.h
SOURCES += sensors.cpp \
qmlsensor.cpp \
@@ -44,7 +46,9 @@ SOURCES += sensors.cpp \
qmlrotationsensor.cpp \
qmlsensorglobal.cpp \
qmltiltsensor.cpp \
- qmlsensorgesture.cpp
+ qmlsensorgesture.cpp \
+ qmlhumiditysensor.cpp \
+ qmllidsensor.cpp
load(qml_plugin)
diff --git a/src/plugins/sensors/sensorfw/Sensors.conf b/src/plugins/sensors/sensorfw/Sensors.conf
index 31d1aff0..b3db5ff3 100644
--- a/src/plugins/sensors/sensorfw/Sensors.conf
+++ b/src/plugins/sensors/sensorfw/Sensors.conf
@@ -10,3 +10,4 @@ QTapSensor=sensorfw.tapsensor
QLightSensor=sensorfw.lightsensor
QIRProximitySensor=sensorfw.irproximitysensor
QGyroscope=sensorfw.gyroscope
+QLidSensor=sensorfw.lidsensor
diff --git a/src/plugins/sensors/sensorfw/main.cpp b/src/plugins/sensors/sensorfw/main.cpp
index 7d4a8839..bc1246ab 100644
--- a/src/plugins/sensors/sensorfw/main.cpp
+++ b/src/plugins/sensors/sensorfw/main.cpp
@@ -48,6 +48,7 @@
#include "sensorfwtapsensor.h"
#include "sensorfwgyroscope.h"
#include "sensorfwlightsensor.h"
+#include "sensorfwlidsensor.h"
#include <QtSensors/qsensorplugin.h>
#include <QtSensors/qsensorbackend.h>
@@ -97,6 +98,8 @@ public:
return new SensorfwTapSensor(sensor);
if (sensor->identifier() == SensorfwGyroscope::id)
return new SensorfwGyroscope(sensor);
+ if (sensor->identifier() == SensorfwLidSensor::id)
+ return new SensorfwLidSensor(sensor);
if (sensor->identifier() == SensorfwLightSensor::id)
return new SensorfwLightSensor(sensor);
if (sensor->identifier() == SensorfwIrProximitySensor::id)
diff --git a/src/plugins/sensors/sensorfw/sensorfw.pri b/src/plugins/sensors/sensorfw/sensorfw.pri
index 31d7254c..ce8e3ab7 100644
--- a/src/plugins/sensors/sensorfw/sensorfw.pri
+++ b/src/plugins/sensors/sensorfw/sensorfw.pri
@@ -9,7 +9,8 @@ HEADERS += sensorfwsensorbase.h \
sensorfwrotationsensor.h \
sensorfwtapsensor.h \
sensorfwlightsensor.h \
- sensorfwirproximitysensor.h
+ sensorfwirproximitysensor.h \
+ sensorfwlidsensor.h
SOURCES += sensorfwsensorbase.cpp \
sensorfwaccelerometer.cpp \
@@ -23,4 +24,5 @@ SOURCES += sensorfwsensorbase.cpp \
sensorfwrotationsensor.cpp \
sensorfwtapsensor.cpp \
sensorfwlightsensor.cpp \
+ sensorfwlidsensor.cpp \
main.cpp
diff --git a/src/plugins/sensors/sensorfw/sensorfwlidsensor.cpp b/src/plugins/sensors/sensorfw/sensorfwlidsensor.cpp
new file mode 100644
index 00000000..18661b95
--- /dev/null
+++ b/src/plugins/sensors/sensorfw/sensorfwlidsensor.cpp
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Canonical, 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$
+**
+****************************************************************************/
+
+#include "sensorfwlidsensor.h"
+
+char const * const SensorfwLidSensor::id("sensorfw.lidsensor");
+
+SensorfwLidSensor::SensorfwLidSensor(QSensor *sensor)
+ : SensorfwSensorBase(sensor)
+ , m_initDone(false)
+{
+ init();
+ setReading<QLidReading>(&m_reading);
+ sensor->setDataRate(10);//set a default rate
+}
+
+void SensorfwLidSensor::slotDataAvailable(const LidData& data)
+{
+ switch (data.type_) {
+ case data.BackLid:
+ m_reading.setBackLidClosed(data.value_);
+ break;
+ case data.FrontLid:
+ m_reading.setFrontLidClosed(data.value_);
+ break;
+ };
+
+ m_reading.setTimestamp(data.timestamp_);
+ newReadingAvailable();
+}
+
+bool SensorfwLidSensor::doConnect()
+{
+ Q_ASSERT(m_sensorInterface);
+ return QObject::connect(m_sensorInterface, SIGNAL(lidChanged(LidData)),
+ this, SLOT(slotDataAvailable(LidData)));
+}
+
+QString SensorfwLidSensor::sensorName() const
+{
+ return "lidsensor";
+}
+
+void SensorfwLidSensor::init()
+{
+ m_initDone = false;
+ initSensor<LidSensorChannelInterface>(m_initDone);
+}
+
+void SensorfwLidSensor::start()
+{
+ if (reinitIsNeeded)
+ init();
+ SensorfwSensorBase::start();
+}
diff --git a/src/plugins/sensors/sensorfw/sensorfwlidsensor.h b/src/plugins/sensors/sensorfw/sensorfwlidsensor.h
new file mode 100644
index 00000000..734fd0f3
--- /dev/null
+++ b/src/plugins/sensors/sensorfw/sensorfwlidsensor.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Canonical, 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 SENSORFWLIDSENSOR_H
+#define SENSORFWLIDSENSOR_H
+
+#include "sensorfwsensorbase.h"
+#include <QtSensors/qlidsensor.h>
+
+#include <lidsensor_i.h>
+#include <liddata.h>
+
+
+class SensorfwLidSensor : public SensorfwSensorBase
+{
+ Q_OBJECT
+
+public:
+ static char const * const id;
+ SensorfwLidSensor(QSensor *sensor);
+protected:
+ bool doConnect() Q_DECL_OVERRIDE;
+ QString sensorName() const Q_DECL_OVERRIDE;
+ void start() Q_DECL_OVERRIDE;
+ virtual void init();
+private:
+ QLidReading m_reading;
+ bool m_initDone;
+private slots:
+ void slotDataAvailable(const LidData& data);
+};
+
+#endif
diff --git a/src/sensors/doc/src/compatmap.qdoc b/src/sensors/doc/src/compatmap.qdoc
index 399bcec8..633e4e5f 100644
--- a/src/sensors/doc/src/compatmap.qdoc
+++ b/src/sensors/doc/src/compatmap.qdoc
@@ -142,6 +142,16 @@
<td bgcolor="gray"></td>
</tr>
<tr>
+ <td nowrap="nowrap">Humidity Sensor</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">IR Proximity Sensor</td>
<td bgcolor="gray"></td>
<td bgcolor="gray"></td>
@@ -152,6 +162,16 @@
<td bgcolor="green"></td>
</tr>
<tr>
+ <td nowrap="nowrap">Lid Sensor</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="green"></td>
+ </tr>
+ <tr>
<td nowrap="nowrap">Light Sensor</td>
<td bgcolor="green"></td>
<td bgcolor="green"></td>
diff --git a/src/sensors/qhumiditysensor.cpp b/src/sensors/qhumiditysensor.cpp
new file mode 100644
index 00000000..aaf60b65
--- /dev/null
+++ b/src/sensors/qhumiditysensor.cpp
@@ -0,0 +1,181 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Canonical 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$
+**
+****************************************************************************/
+
+#include <qhumiditysensor.h>
+#include "qhumiditysensor_p.h"
+
+QT_BEGIN_NAMESPACE
+
+IMPLEMENT_READING(QHumidityReading)
+
+/*!
+ \class QHumidityReading
+ \ingroup sensors_reading
+ \inmodule QtSensors
+ \since 5.9
+
+ \brief The QHumidityReading class holds readings from the humidity sensor.
+
+ \section2 QHumidityReading Units
+
+ The humidity sensor returns the relative humidity as a percentage, and absolute humidity in
+ grams per cubic meter (g/m3).
+ Note that some sensors may not support absolute humidity, 0 will be returned in this case.
+*/
+
+/*!
+ \property QHumidityReading::relativeHumidity
+ \brief Relative humidity
+ Returned as a percentage.
+
+ \sa {QHumidityReading Units}
+*/
+
+qreal QHumidityReading::relativeHumidity() const
+{
+ return d->relativeHumidity;
+}
+
+/*!
+ Sets relativeHumidity to \a humidity.
+*/
+void QHumidityReading::setRelativeHumidity(qreal humidity)
+{
+ d->relativeHumidity = humidity;
+}
+
+/*!
+ \property QHumidityReading::absoluteHumidity
+ \brief Absolute humidity
+ Measured in grams per cubic meter.
+ Note that some sensors may not support absolute humidity.
+
+ \sa {QHumidityReading Units}
+*/
+
+qreal QHumidityReading::absoluteHumidity() const
+{
+ return d->absoluteHumidity;
+}
+
+/*!
+ Sets absoluteHumidity to \a value.
+*/
+void QHumidityReading::setAbsoluteHumidity(qreal value)
+{
+ d->absoluteHumidity = value;
+}
+
+// =====================================================================
+
+/*!
+ \class QHumidityFilter
+ \ingroup sensors_filter
+ \inmodule QtSensors
+ \since 5.9
+
+ \brief The QHumidityFilter class is a convenience wrapper around QSensorFilter.
+
+ The only difference is that the filter() method features a pointer to QHumidityReading
+ instead of QSensorReading.
+*/
+
+/*!
+ \fn QHumidityFilter::filter(QHumidityReading *reading)
+
+ Called when \a reading changes. Returns false to prevent the reading from propagating.
+
+ \sa QSensorFilter::filter()
+*/
+
+bool QHumidityFilter::filter(QSensorReading *reading)
+{
+ return filter(static_cast<QHumidityReading*>(reading));
+}
+
+char const * const QHumiditySensor::type("QHumiditySensor");
+
+
+/*!
+ \class QHumiditySensor
+ \ingroup sensors_type
+ \inmodule QtSensors
+ \since 5.9
+
+ \brief The QHumiditySensor class is a convenience wrapper around QSensor.
+
+ The only behavioural difference is that this class sets the type properly.
+
+ This class also features a reading() function that returns a QHumidityReading instead of a QSensorReading.
+
+ For details about how the sensor works, see \l QHumidityReading.
+
+ \sa QHumidityReading
+*/
+
+/*!
+ Construct the sensor as a child of \a parent.
+*/
+QHumiditySensor::QHumiditySensor(QObject *parent)
+ : QSensor(QHumiditySensor::type, parent)
+{
+}
+
+/*!
+ Destroy the sensor. Stops the sensor if it has not already been stopped.
+*/
+QHumiditySensor::~QHumiditySensor()
+{
+}
+
+/*!
+ \fn QHumiditySensor::reading() const
+
+ Returns the reading class for this sensor.
+
+ \sa QSensor::reading()
+*/
+
+QHumidityReading *QHumiditySensor::reading() const
+{
+ return static_cast<QHumidityReading*>(QSensor::reading());
+}
+
+#include "moc_qhumiditysensor.cpp"
+QT_END_NAMESPACE
diff --git a/src/sensors/qhumiditysensor.h b/src/sensors/qhumiditysensor.h
new file mode 100644
index 00000000..d916fb73
--- /dev/null
+++ b/src/sensors/qhumiditysensor.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Canonical 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 QHUMIDITYSENSOR_H
+#define QHUMIDITYSENSOR_H
+
+#include <QtSensors/qsensor.h>
+
+QT_BEGIN_NAMESPACE
+
+class QHumidityReadingPrivate;
+
+class Q_SENSORS_EXPORT QHumidityReading : public QSensorReading
+{
+ Q_OBJECT
+ Q_PROPERTY(qreal relativeHumidity READ relativeHumidity)
+ Q_PROPERTY(qreal absoluteHumidity READ absoluteHumidity)
+
+ DECLARE_READING(QHumidityReading)
+public:
+ qreal relativeHumidity() const;
+ void setRelativeHumidity(qreal percent);
+
+ qreal absoluteHumidity() const;
+ void setAbsoluteHumidity(qreal value);
+};
+
+class Q_SENSORS_EXPORT QHumidityFilter : public QSensorFilter
+{
+public:
+ virtual bool filter(QHumidityReading *reading) = 0;
+private:
+ bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+};
+
+class QHumiditySensorPrivate;
+
+class Q_SENSORS_EXPORT QHumiditySensor : public QSensor
+{
+ Q_OBJECT
+public:
+ explicit QHumiditySensor(QObject *parent = Q_NULLPTR);
+ ~QHumiditySensor();
+
+ QHumidityReading *reading() const;
+ static char const * const type;
+
+private:
+ Q_DECLARE_PRIVATE(QHumiditySensor)
+ Q_DISABLE_COPY(QHumiditySensor)
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/sensors/qhumiditysensor_p.h b/src/sensors/qhumiditysensor_p.h
new file mode 100644
index 00000000..95b070ea
--- /dev/null
+++ b/src/sensors/qhumiditysensor_p.h
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Canonical 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 QHUMIDITYSENSOR_P_H
+#define QHUMIDITYSENSOR_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 "qsensor_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QHumidityReadingPrivate
+{
+public:
+ QHumidityReadingPrivate()
+ : relativeHumidity(0),
+ absoluteHumidity(0)
+ {
+ }
+
+ qreal relativeHumidity;
+ qreal absoluteHumidity;
+};
+
+class QHumiditySensorPrivate : public QSensorPrivate
+{
+public:
+ QHumiditySensorPrivate()
+ {
+ }
+
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/sensors/qlidsensor.cpp b/src/sensors/qlidsensor.cpp
new file mode 100644
index 00000000..a759afd9
--- /dev/null
+++ b/src/sensors/qlidsensor.cpp
@@ -0,0 +1,182 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Canonical, 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$
+**
+****************************************************************************/
+#include <qlidsensor.h>
+#include "qlidsensor_p.h"
+
+QT_BEGIN_NAMESPACE
+
+IMPLEMENT_READING(QLidReading)
+
+/*!
+ \class QLidReading
+ \ingroup sensors_reading
+ \inmodule QtSensors
+ \since 5.9
+
+ \brief The QLidReading class holds readings from the Lid sensor.
+
+ A normal laptop has what we call a front lid.
+
+ If the laptop can be converted to a tablet by rotating or closing the lid
+ where the display is out, this is known as a back lid.
+
+ \section2 QLidReading Units
+ The Lid sensor can detect if a device's lid is closed or not. A lid can be a laptop,
+ a laptop that converts to a tablet, or even a cover for a tablet or phone.
+*/
+
+/*!
+ \property QLidReading::backLidClosed
+ \brief A value indicating whether the back lid is closed.
+ A back lid can be when a convertable laptop is closed
+ into to tablet mode without keyboard.
+
+ \sa {QLidReading Units}
+*/
+
+bool QLidReading::backLidClosed() const
+{
+ return d->backLidClosed;
+}
+
+/*!
+ Sets the backLidClosed value to \a closed.
+*/
+void QLidReading::setBackLidClosed(bool closed)
+{
+ d->backLidClosed = closed;
+}
+
+/*!
+ \property QLidReading::frontLidClosed
+ \brief A value indicating whether the front lid is closed.
+ A front lid would be a normal laptop lid.
+ \sa {QLidReading Units}
+*/
+
+bool QLidReading::frontLidClosed() const
+{
+ return d->frontLidClosed;
+}
+
+/*!
+ Sets the frontLidClosed value to \a closed.
+*/
+void QLidReading::setFrontLidClosed(bool closed)
+{
+ d->frontLidClosed = closed;
+}
+
+// =====================================================================
+
+/*!
+ \class QLidFilter
+ \ingroup sensors_filter
+ \inmodule QtSensors
+ \since 5.9
+
+ \brief The QLidFilter class is a convenience wrapper around QSensorFilter.
+
+ The only difference is that the filter() method features a pointer to QLidReading
+ instead of QSensorReading.
+*/
+
+/*!
+ \fn QLidFilter::filter(QLidReading *reading)
+
+ Called when \a reading changes. Returns false to prevent the reading from propagating.
+
+ \sa QSensorFilter::filter()
+*/
+
+bool QLidFilter::filter(QSensorReading *reading)
+{
+ return filter(static_cast<QLidReading*>(reading));
+}
+
+char const * const QLidSensor::type("QLidSensor");
+
+/*!
+ \class QLidSensor
+ \ingroup sensors_type
+ \inmodule QtSensors
+ \since 5.9
+
+ \brief The QLidSensor class is a convenience wrapper around QSensor.
+
+ The only behavioural difference is that this class sets the type properly.
+
+ This class also features a reading() function that returns a QLidReading instead
+ of a QSensorReading.
+
+ For details about how the sensor works, see \l QLidReading.
+
+ \sa QLidReading
+*/
+
+/*!
+ Construct the sensor as a child of \a parent.
+*/
+QLidSensor::QLidSensor(QObject *parent)
+ : QSensor(QLidSensor::type, parent)
+{
+}
+
+/*!
+ Destroy the sensor. Stops the sensor if it has not already been stopped.
+*/
+QLidSensor::~QLidSensor()
+{
+}
+
+/*!
+ \fn QLidSensor::reading() const
+
+ Returns the reading class for this sensor.
+
+ \sa QSensor::reading()
+*/
+
+QLidReading *QLidSensor::reading() const
+{
+ return static_cast<QLidReading*>(QSensor::reading());
+}
+
+#include "moc_qlidsensor.cpp"
+QT_END_NAMESPACE
diff --git a/src/sensors/qlidsensor.h b/src/sensors/qlidsensor.h
new file mode 100644
index 00000000..c0f88a79
--- /dev/null
+++ b/src/sensors/qlidsensor.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Canonical, 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 QLIDSENSOR_H
+#define QLIDSENSOR_H
+
+#include <QtSensors/qsensor.h>
+
+QT_BEGIN_NAMESPACE
+
+class QLidReadingPrivate;
+
+class Q_SENSORS_EXPORT QLidReading : public QSensorReading
+{
+ Q_OBJECT
+ Q_PROPERTY(bool backLidClosed READ backLidClosed)
+ Q_PROPERTY(bool frontLidClosed READ frontLidClosed)
+ DECLARE_READING(QLidReading)
+public:
+
+ bool backLidClosed() const;
+ void setBackLidClosed(bool closed);
+
+ bool frontLidClosed() const;
+ void setFrontLidClosed(bool closed);
+
+Q_SIGNALS:
+ void backLidChanged(bool closed);
+ void frontLidChanged(bool closed);
+};
+
+class Q_SENSORS_EXPORT QLidFilter : public QSensorFilter
+{
+public:
+ virtual bool filter(QLidReading *reading) = 0;
+private:
+ bool filter(QSensorReading *reading) Q_DECL_OVERRIDE;
+};
+
+class Q_SENSORS_EXPORT QLidSensor : public QSensor
+{
+ Q_OBJECT
+public:
+ explicit QLidSensor(QObject *parent = Q_NULLPTR);
+ ~QLidSensor();
+ QLidReading *reading() const;
+ static char const * const type;
+
+private:
+ Q_DISABLE_COPY(QLidSensor)
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/sensors/qlidsensor_p.h b/src/sensors/qlidsensor_p.h
new file mode 100644
index 00000000..93d3b99e
--- /dev/null
+++ b/src/sensors/qlidsensor_p.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Canonical, 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 QLIDSENSOR_P_H
+#define QLIDSENSOR_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 QLidReadingPrivate
+{
+public:
+ QLidReadingPrivate()
+ : backLidClosed(false),frontLidClosed(false)
+ {
+ }
+
+ bool backLidClosed;
+ bool frontLidClosed;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro
index 9eeceb8c..e66d427f 100644
--- a/src/sensors/sensors.pro
+++ b/src/sensors/sensors.pro
@@ -71,7 +71,9 @@ SENSORS=\
qtapsensor\
qtiltsensor\
qgyroscope\
- qpressuresensor
+ qpressuresensor \
+ qhumiditysensor \
+ qlidsensor
for(s,SENSORS) {
# Client API
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 16:11:04 +0000