Merge remote-tracking branch 'origin/5.8.0' into 5.8

Change-Id: Ie2a370961bb6b166af94f8699945c330aa8125c7

2 files changed, 6 insertions, 6 deletions

diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes
index e1857a6..25a992a 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.8'
 
 Module {
-    dependencies: ["QtQuick 2.0"]
+    dependencies: ["QtQuick 2.8"]
     Component {
         name: "QmlAccelerometer"
         prototype: "QmlSensor"
@@ -52,7 +52,7 @@ Module {
         exports: [
             "QtSensors/Altimeter 5.1",
             "QtSensors/Altimeter 5.2",
-            "QtSensors/Altimeter 5.7"
+            "QtSensors/Altimeter 5.8"
         ]
         exportMetaObjectRevisions: [0, 0, 0]
     }
diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp
index d1f5bb4..f92ad77 100644
--- a/src/imports/sensors/sensors.cpp
+++ b/src/imports/sensors/sensors.cpp
@@ -222,10 +222,10 @@ public:
 
         qmlRegisterType           <QmlSensorGesture            >(package, major, minor, "SensorGesture");
 
-        // Register the 5.7 interfaces
+        // Register the 5.8 interfaces
         // No API changes, just reintroduce existing interfaces from 5.2
-        // Implicitly registers 5.3 - 5.6 too
-        minor = 7;
+        // Implicitly registers 5.3 - 5.7 too
+        minor = 8;
         qmlRegisterType           <QmlAltimeter                >(package, major, minor, "Altimeter");
     }
 };