summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@qt.io>2016-08-29 09:02:53 +0200
committerLiang Qi <liang.qi@qt.io>2016-08-31 08:41:53 +0000
commit3523afa703792fabc8bac3febe5541766bc1ccd4 (patch)
tree771052956f5602cb40eac5b3d946eadaebfbae64
parentc2556c5ba4119243ac54bee6ff127cf64449b685 (diff)
downloadqtsensors-3523afa703792fabc8bac3febe5541766bc1ccd4.tar.gz
QHumiditySensor will be added by Qt 5.9
[ChangeLog][General][QHumiditySensor] Added QHumiditySensor sensor API. Change-Id: I6dcac53d75ec427fd585de082f4e3a5adb2ebde2 Reviewed-by: Lorn Potter <lorn.potter@canonical.com> Reviewed-by: Liang Qi <liang.qi@qt.io>
-rw-r--r--src/imports/sensors/qmlhumiditysensor.cpp4
-rw-r--r--src/sensors/doc/src/compatmap.qdoc10
-rw-r--r--src/sensors/qhumiditysensor.cpp6
3 files changed, 15 insertions, 5 deletions
diff --git a/src/imports/sensors/qmlhumiditysensor.cpp b/src/imports/sensors/qmlhumiditysensor.cpp
index 36534c8..3b30e97 100644
--- a/src/imports/sensors/qmlhumiditysensor.cpp
+++ b/src/imports/sensors/qmlhumiditysensor.cpp
@@ -45,7 +45,7 @@
\instantiates QmlHumiditySensor
\ingroup qml-sensors_type
\inqmlmodule QtSensors
- \since QtSensors 5.8
+ \since QtSensors 5.9
\inherits Sensor
\brief The HumiditySensor element reports on humidity.
@@ -82,7 +82,7 @@ QSensor *QmlHumiditySensor::sensor() const
\instantiates QmlHumidityReading
\ingroup qml-sensors_reading
\inqmlmodule QtSensors
- \since QtSensors 5.8
+ \since QtSensors 5.9
\inherits SensorReading
\brief The HumidityReading element holds the most recent HumiditySensor reading.
diff --git a/src/sensors/doc/src/compatmap.qdoc b/src/sensors/doc/src/compatmap.qdoc
index 399bcec..ee94d51 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>
diff --git a/src/sensors/qhumiditysensor.cpp b/src/sensors/qhumiditysensor.cpp
index 80b14e1..aaf60b6 100644
--- a/src/sensors/qhumiditysensor.cpp
+++ b/src/sensors/qhumiditysensor.cpp
@@ -48,7 +48,7 @@ IMPLEMENT_READING(QHumidityReading)
\class QHumidityReading
\ingroup sensors_reading
\inmodule QtSensors
- \since 5.8
+ \since 5.9
\brief The QHumidityReading class holds readings from the humidity sensor.
@@ -108,7 +108,7 @@ void QHumidityReading::setAbsoluteHumidity(qreal value)
\class QHumidityFilter
\ingroup sensors_filter
\inmodule QtSensors
- \since 5.8
+ \since 5.9
\brief The QHumidityFilter class is a convenience wrapper around QSensorFilter.
@@ -136,7 +136,7 @@ char const * const QHumiditySensor::type("QHumiditySensor");
\class QHumiditySensor
\ingroup sensors_type
\inmodule QtSensors
- \since 5.8
+ \since 5.9
\brief The QHumiditySensor class is a convenience wrapper around QSensor.