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

 Conflicts:
	.qmake.conf

Change-Id: I17dec1cd2d4934710663e5fa97c926a65fe301e5

3 files changed, 5 insertions, 2 deletions

diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes
index 2972b94d..bcad4cc5 100644
--- a/src/imports/sensors/plugins.qmltypes
+++ b/src/imports/sensors/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtSensors 5.9'
+// 'qmlplugindump -nonrelocatable QtSensors 5.10'
 
 Module {
     dependencies: ["QtQuick 2.8"]
diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp
index df81880b..ffa09d80 100644
--- a/src/imports/sensors/sensors.cpp
+++ b/src/imports/sensors/sensors.cpp
@@ -229,6 +229,9 @@ public:
         minor = 9;
         qmlRegisterType           <QmlLidSensor                >(package, major, minor, "LidSensor");
         qmlRegisterUncreatableType<QmlLidReading               >(package, major, minor, "LidReading",          QLatin1String("Cannot create LidReading"));
+
+        // Register the latest Qt version as QML type version
+        qmlRegisterModule(package, QT_VERSION_MAJOR, QT_VERSION_MINOR);
     }
 };
 
diff --git a/src/sensors/qsensorbackend.cpp b/src/sensors/qsensorbackend.cpp
index c17e6383..57679a55 100644
--- a/src/sensors/qsensorbackend.cpp
+++ b/src/sensors/qsensorbackend.cpp
@@ -147,7 +147,7 @@ QSensor *QSensorBackend::sensor() const
 }
 
 /*!
-    \fn QSensorBackend::setReading(T *reading)
+    \fn QSensorBackend<T>::setReading(T *reading)
 
     This function is called to initialize the \a reading
     classes used for a sensor.