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

Conflicts:
	.qmake.conf

Change-Id: Iac052b07a815ed6bcaea42109895e323342c5d71

2 files changed, 30 insertions, 13 deletions

diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes
index e1857a6..2972b94 100644
--- a/src/imports/sensors/plugins.qmltypes
+++ b/src/imports/sensors/plugins.qmltypes
@@ -4,10 +4,10 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtSensors 5.7'
+// 'qmlplugindump -nonrelocatable QtSensors 5.9'
 
 Module {
-    dependencies: ["QtQuick 2.0"]
+    dependencies: ["QtQuick 2.8"]
     Component {
         name: "QmlAccelerometer"
         prototype: "QmlSensor"
@@ -49,12 +49,8 @@ Module {
     Component {
         name: "QmlAltimeter"
         prototype: "QmlSensor"
-        exports: [
-            "QtSensors/Altimeter 5.1",
-            "QtSensors/Altimeter 5.2",
-            "QtSensors/Altimeter 5.7"
-        ]
-        exportMetaObjectRevisions: [0, 0, 0]
+        exports: ["QtSensors/Altimeter 5.1", "QtSensors/Altimeter 5.2"]
+        exportMetaObjectRevisions: [0, 0]
     }
     Component {
         name: "QmlAltimeterReading"
@@ -199,6 +195,30 @@ Module {
         Property { name: "reflectance"; type: "double"; isReadonly: true }
     }
     Component {
+        name: "QmlLidReading"
+        prototype: "QmlSensorReading"
+        exports: ["QtSensors/LidReading 5.9"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property { name: "backLidChanged"; type: "bool"; isReadonly: true }
+        Property { name: "frontLidClosed"; type: "bool"; isReadonly: true }
+        Signal {
+            name: "backLidChanged"
+            Parameter { name: "closed"; type: "bool" }
+        }
+        Signal {
+            name: "frontLidChanged"
+            type: "bool"
+            Parameter { name: "closed"; type: "bool" }
+        }
+    }
+    Component {
+        name: "QmlLidSensor"
+        prototype: "QmlSensor"
+        exports: ["QtSensors/LidSensor 5.9"]
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
         name: "QmlLightSensor"
         prototype: "QmlSensor"
         exports: [
diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp
index fa8c8e2..28f85d3 100644
--- a/src/imports/sensors/sensors.cpp
+++ b/src/imports/sensors/sensors.cpp
@@ -224,11 +224,8 @@ public:
 
         qmlRegisterType           <QmlSensorGesture            >(package, major, minor, "SensorGesture");
 
-        minor = 7;
-        qmlRegisterType           <QmlAltimeter                >(package, major, minor, "Altimeter");
-        // Register the 5.9 interfaces
-        // No API changes, just reintroduce existing interfaces from 5.2
-        // Implicitly registers 5.3 - 5.7 too
+        // Register the new 5.9 interfaces
+        // Implicitly registers 5.3 - 5.8 too
         minor = 9;
         qmlRegisterType           <QmlLidSensor                >(package, major, minor, "LidSensor");
         qmlRegisterUncreatableType<QmlLidReading               >(package, major, minor, "LidReading",          QLatin1String("Cannot create LidReading"));