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

Conflicts:
	.qmake.conf

Change-Id: Iac052b07a815ed6bcaea42109895e323342c5d71

1 files changed, 2 insertions, 5 deletions

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"));