Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
	.qmake.conf

Change-Id: Ic691e11af371acfb7706ee218665fb5a9f96a9c3

1 files changed, 29 insertions, 0 deletions

diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes
index 80e1df36..b78e63c6 100644
--- a/src/imports/sensors/plugins.qmltypes
+++ b/src/imports/sensors/plugins.qmltypes
@@ -129,6 +129,20 @@ Module {
         Property { name: "calibrationLevel"; type: "double"; isReadonly: true }
     }
     Component {
+        name: "QmlDistanceReading"
+        prototype: "QmlSensorReading"
+        exports: ["QtSensors/DistanceReading 5.4"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property { name: "distance"; type: "double"; isReadonly: true }
+    }
+    Component {
+        name: "QmlDistanceSensor"
+        prototype: "QmlSensor"
+        exports: ["QtSensors/DistanceSensor 5.4"]
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
         name: "QmlGyroscope"
         prototype: "QmlSensor"
         exports: [
@@ -173,6 +187,21 @@ Module {
         exportMetaObjectRevisions: [0, 0]
     }
     Component {
+        name: "QmlHumidityReading"
+        prototype: "QmlSensorReading"
+        exports: ["QtSensors/HumidityReading 5.9"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property { name: "relativeHumidity"; type: "double"; isReadonly: true }
+        Property { name: "absoluteHumidity"; type: "double"; isReadonly: true }
+    }
+    Component {
+        name: "QmlHumiditySensor"
+        prototype: "QmlSensor"
+        exports: ["QtSensors/HumiditySensor 5.9"]
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
         name: "QmlIRProximitySensor"
         prototype: "QmlSensor"
         exports: [