Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: I4286dcb9262bf38960ff3852932012718aaa5d65

3 files changed, 12 insertions, 12 deletions

diff --git a/src/sensors/doc/src/compatmap.qdoc b/src/sensors/doc/src/compatmap.qdoc
index f6a99a9e..4f45fcbc 100644
--- a/src/sensors/doc/src/compatmap.qdoc
+++ b/src/sensors/doc/src/compatmap.qdoc
@@ -88,7 +88,7 @@
     <td bgcolor="gray"></td>
     <td bgcolor="green"></td>
     <td bgcolor="gray"></td>
-    <td bgcolor="gray"></td>
+    <td bgcolor="green"></td>
     <td bgcolor="green"></td>
     </tr>
     <tr>
diff --git a/src/sensors/doc/src/qtsensors-backend.qdoc b/src/sensors/doc/src/qtsensors-backend.qdoc
index 98fcd741..65ea612b 100644
--- a/src/sensors/doc/src/qtsensors-backend.qdoc
+++ b/src/sensors/doc/src/qtsensors-backend.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-\group sensors_backend_topics
+\page sensors-backend-topics.html
 \title Qt Sensors Backend
 \brief Describes how to use the Qt Sensors backend.
 
@@ -37,8 +37,6 @@ hardware sensors.
 
 \section1 Overview
 
-\section1 Backend API
-
 QSensor instances talk to a backend object. Backends are usually supplied
 with the Qt Sensors library for a specific device, although third-party
 backends may be used as well. A backend can talk directly to hardware, or
@@ -53,14 +51,16 @@ classes to use.
 
 \section1 Backend Topics
 
-\generatelist related
-
+\list
+\li \l{Creating a sensor plugin}
+\li \l{Determining the default sensor for a type}
+\li \l{Dynamic Sensor Backend Registration}
+\endlist
 */
 
 /*!
 \page creating-a-sensor-plugin.html
 \title Creating a sensor plugin
-\ingroup sensors_backend_topics
 
 \section1 How a Sensor Plugin is Loaded
 
@@ -83,7 +83,6 @@ An example follows.
 /*!
 \page determining-the-default-sensor-for-a-type.html
 \title Determining the default sensor for a type
-\ingroup sensors_backend_topics
 
 \section1 Multiple Sensors Can Exist for a Type
 
@@ -141,7 +140,6 @@ it is specified in \c{Sensors.conf}.
 /*!
 \page dynamic-sensor-backend-registration.html
 \title Dynamic Sensor Backend Registration
-\ingroup sensors_backend_topics
 
 \section1 Static Backend Registration
 
diff --git a/src/sensors/doc/src/qtsensors5.qdoc b/src/sensors/doc/src/qtsensors5.qdoc
index 69e7abb0..bf7fa982 100644
--- a/src/sensors/doc/src/qtsensors5.qdoc
+++ b/src/sensors/doc/src/qtsensors5.qdoc
@@ -51,14 +51,14 @@
 
     If the module is imported into a namespace, some additional methods become available.
 
-    \code
+    \qml
     import QtSensors 5.0
-    ...
+    //  ...
         Component.onCompleted: {
             var types = QmlSensors.sensorTypes();
             console.log(types.join(", "));
         }
-    \endcode
+    \endqml
 
     The documentation for the module API can be found in SensorGlobal.
 
@@ -75,4 +75,6 @@
     The data from a sensor comes via a reading class.
 
     \annotatedlist qml-sensors_reading
+
+    \section1 All QML Types
 */