9 files changed, 49 insertions, 6 deletions
diff --git a/src/sensors/doc/qtsensors.qdocconf b/src/sensors/doc/qtsensors.qdocconf
index b84d3fa3..af17ad34 100644
--- a/src/sensors/doc/qtsensors.qdocconf
+++ b/src/sensors/doc/qtsensors.qdocconf
@@ -52,3 +52,7 @@ examplesinstallpath = sensors
 imagedirs   += images
 
 depends += qtcore qtdoc qtgui
+
+navigation.landingpage = "Qt Sensors"
+navigation.cppclassespage = "Qt Sensors C++ Classes"
+navigation.qmltypespage = "Qt Sensors QML Types"
diff --git a/src/sensors/doc/src/compatmap.qdoc b/src/sensors/doc/src/compatmap.qdoc
index 5e541def..e3a35304 100644
--- a/src/sensors/doc/src/compatmap.qdoc
+++ b/src/sensors/doc/src/compatmap.qdoc
@@ -90,7 +90,7 @@
     <tr>
     <td nowrap="nowrap">Ambient Temperature Sensor</td>
     <td bgcolor="gray"></td>
-    <td bgcolor="gray"></td>
+    <td bgcolor="green"></td>
     <td bgcolor="gray"></td>
     <td bgcolor="gray"></td>
     <td bgcolor="gray"></td>
@@ -162,7 +162,7 @@
     <tr>
     <td nowrap="nowrap">Pressure Sensor</td>
     <td bgcolor="green"></td>
-    <td bgcolor="gray"></td>
+    <td bgcolor="green"></td>
     <td bgcolor="gray"></td>
     <td bgcolor="gray"></td>
     <td bgcolor="gray"></td>
@@ -171,7 +171,7 @@
     <tr>
     <td nowrap="nowrap">Proximity Sensor</td>
     <td bgcolor="green"></td>
-    <td bgcolor="gray"></td>
+    <td bgcolor="green"></td>
     <td bgcolor="gray"></td>
     <td bgcolor="green"></td>
     <td bgcolor="gray"></td>
diff --git a/src/sensors/doc/src/qtsensors-cpp.qdoc b/src/sensors/doc/src/qtsensors-cpp.qdoc
index 2f60592a..5157ddad 100644
--- a/src/sensors/doc/src/qtsensors-cpp.qdoc
+++ b/src/sensors/doc/src/qtsensors-cpp.qdoc
@@ -56,7 +56,9 @@ Where rotation around an axis is used, the rotation shall be expressed as a Righ
 
 \image sensors-coordinates3.jpg
 
-In general, sensor data is oriented to the top of the device. If values are to be displayed on
+In general, sensor data is oriented relative to \l QPlatformScreen::nativeOrientation, i.e
+to the top of the device when the device is held in its natural orientation (normally
+when the device logo appears the right side up). If values are to be displayed on
 the screen the values may need to be transformed so that they match the user interface orientation. A sensor
 may define its data as being oriented to the UI. This will be noted in the documentation for the
 sensor.
diff --git a/src/sensors/doc/src/qtsensors5.qdoc b/src/sensors/doc/src/qtsensors5.qdoc
index 90af5f61..0be75e8b 100644
--- a/src/sensors/doc/src/qtsensors5.qdoc
+++ b/src/sensors/doc/src/qtsensors5.qdoc
@@ -30,6 +30,7 @@
     \module QtSensors
     \title Qt Sensors C++ Classes
     \ingroup modules
+    \qtvariable sensors
 
     \brief The QtSensors module provides classes for reading sensor data.
 
@@ -75,4 +76,3 @@
 
     \annotatedlist qml-sensors_reading
 */
-
diff --git a/src/sensors/qpressuresensor.cpp b/src/sensors/qpressuresensor.cpp
index ceb77dff..1aea843a 100644
--- a/src/sensors/qpressuresensor.cpp
+++ b/src/sensors/qpressuresensor.cpp
@@ -79,6 +79,33 @@ void QPressureReading::setPressure(qreal pressure)
     d->pressure = pressure;
 }
 
+/*!
+    \property QPressureReading::temperature
+    \brief The pressure sensor's temperature.
+    \since 5.2
+
+    The temperature is returned in degree Celsius.
+    This property, if supported, provides the pressure sensor die temperature.
+    Note that this temperature may be (and usually is) different than the temperature
+    reported from QAmbientTemperatureSensor.
+    Use QSensor::isFeatureSupported() with the QSensor::PressureSensorTemperature
+    flag to determine its availability.
+*/
+
+qreal QPressureReading::temperature() const
+{
+    return d->temperature;
+}
+
+/*!
+    Sets the pressure sensor's temperature to \a temperature.
+    \since 5.2
+*/
+void QPressureReading::setTemperature(qreal temperature)
+{
+    d->temperature =  temperature;
+}
+
 // =====================================================================
 
 /*!
diff --git a/src/sensors/qpressuresensor.h b/src/sensors/qpressuresensor.h
index 2a544cb0..8a14d410 100644
--- a/src/sensors/qpressuresensor.h
+++ b/src/sensors/qpressuresensor.h
@@ -51,10 +51,14 @@ class Q_SENSORS_EXPORT QPressureReading : public QSensorReading
 {
     Q_OBJECT
     Q_PROPERTY(qreal pressure READ pressure)
+    Q_PROPERTY(qreal temperature READ temperature)
     DECLARE_READING(QPressureReading)
 public:
     qreal pressure() const;
     void setPressure(qreal pressure);
+
+    qreal temperature() const;
+    void setTemperature(qreal temperature);
 };
 
 class Q_SENSORS_EXPORT QPressureFilter : public QSensorFilter
diff --git a/src/sensors/qpressuresensor_p.h b/src/sensors/qpressuresensor_p.h
index 1c74e7f1..f91b3bad 100644
--- a/src/sensors/qpressuresensor_p.h
+++ b/src/sensors/qpressuresensor_p.h
@@ -58,11 +58,12 @@ class QPressureReadingPrivate
 {
 public:
     QPressureReadingPrivate()
-        : pressure(0)
+        : pressure(0), temperature(0)
     {
     }
 
     qreal pressure;
+    qreal temperature;
 };
 
 QT_END_NAMESPACE
diff --git a/src/sensors/qsensor.cpp b/src/sensors/qsensor.cpp
index 473c459a..7f05189f 100644
--- a/src/sensors/qsensor.cpp
+++ b/src/sensors/qsensor.cpp
@@ -245,6 +245,10 @@ void QSensorPrivate::init(const QByteArray &sensorType)
     \value AccelerationMode The backend supports switching the acceleration mode
                             of the acceleromter with the QAccelerometer::accelerationMode property.
 
+    The features of QPressureSensor are:
+
+    \value PressureSensorTemperature The backend provides the pressure sensor's die temperature
+
     The features of all orientable sensors are:
 
     \value AxesOrientation The backend supports changing the axes orientation from the default of
diff --git a/src/sensors/qsensor.h b/src/sensors/qsensor.h
index 2b602488..b83d736b 100644
--- a/src/sensors/qsensor.h
+++ b/src/sensors/qsensor.h
@@ -107,6 +107,7 @@ public:
         AccelerationMode,
         SkipDuplicates,
         AxesOrientation,
+        PressureSensorTemperature,
         Reserved = 257 // Make sure at least 2 bytes are used for the enum to avoid breaking BC later
     };