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

Change-Id: Ic47f81aec558260a2271485dc953957cbed9ce67

2 files changed, 5 insertions, 5 deletions

diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes
index 2c72e1ff..e1857a65 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.6'
+// 'qmlplugindump -nonrelocatable QtSensors 5.7'
 
 Module {
     dependencies: ["QtQuick 2.0"]
@@ -52,7 +52,7 @@ Module {
         exports: [
             "QtSensors/Altimeter 5.1",
             "QtSensors/Altimeter 5.2",
-            "QtSensors/Altimeter 5.6"
+            "QtSensors/Altimeter 5.7"
         ]
         exportMetaObjectRevisions: [0, 0, 0]
     }
diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp
index 27a648c1..c6f61c22 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.5 interfaces
+        // Register the 5.7 interfaces
         // No API changes, just reintroduce existing interfaces from 5.2
-        // Implicitly registers 5.3 - 5.5 too
-        minor = 6;
+        // Implicitly registers 5.3 - 5.6 too
+        minor = 7;
         qmlRegisterType           <QmlAltimeter                >(package, major, minor, "Altimeter");
     }
 };