From 3523afa703792fabc8bac3febe5541766bc1ccd4 Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@qt.io>
Date: Mon, 29 Aug 2016 09:02:53 +0200
Subject: 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>
---
 src/imports/sensors/qmlhumiditysensor.cpp |  4 ++--
 src/sensors/doc/src/compatmap.qdoc        | 10 ++++++++++
 src/sensors/qhumiditysensor.cpp           |  6 +++---
 3 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/imports/sensors/qmlhumiditysensor.cpp b/src/imports/sensors/qmlhumiditysensor.cpp
index 36534c80..3b30e972 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 399bcec8..ee94d512 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 80b14e1d..aaf60b65 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.
 
-- 
cgit v1.2.3