From 50ab964e04ff3c4bf309133fc26b030d0c250595 Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@qt.io>
Date: Thu, 7 Dec 2017 16:09:22 +0100
Subject: Register all Sensor QML types under latest Qt version tag

No new types were introduced in Qt 5.10.

Change-Id: I0f172fc46c23e296bdb29f39b7d30a616e7beb0b
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
---
 src/imports/sensors/plugins.qmltypes | 2 +-
 src/imports/sensors/sensors.cpp      | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

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 28f85d37..4c39b0e3 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);
     }
 };
 
-- 
cgit v1.2.1


From bfe35b4ebc4ac46fd181b36d35e6535064f4e056 Mon Sep 17 00:00:00 2001
From: Nico Vertriest <nico.vertriest@qt.io>
Date: Mon, 11 Dec 2017 15:12:28 +0100
Subject: Doc: correct clang error message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

qsensorbackend.cpp:149: (qdoc) warning: clang found diagnostics parsing \fn QSensorBackend::setReading(T *reading)

Change-Id: I274c9eea76eab9071f47d8bebcfd163d5867281a
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
---
 src/sensors/qsensorbackend.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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.
-- 
cgit v1.2.1