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

Change-Id: I07a2f4160750b548dfee882cb9b5b057d83236e2

4 files changed, 11 insertions, 11 deletions

diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index 4536b371..a0b61d6e 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -166,8 +166,8 @@ public:
             qmlRegisterUncreatableType<QQuickGeoMapGestureArea, 1>(uri, major, minor, "MapGestureArea",
                                         QStringLiteral("(Map)GestureArea is not intended instantiable by developer."));
 
-            // Register the 5.7 types
-            minor = 7;
+            // Register the 5.8 types
+            minor = 8;
             qmlRegisterType<QDeclarativeGeoManeuver>(uri, major, minor, "RouteManeuver");
 
             // Register the 5.9 types
diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes
index 4e8749da..b89963ad 100644
--- a/src/imports/location/plugins.qmltypes
+++ b/src/imports/location/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 QtLocation 5.7'
+// 'qmlplugindump -nonrelocatable QtLocation 5.8'
 
 Module {
-    dependencies: ["QtQuick 2.0"]
+    dependencies: ["QtQuick 2.8"]
     Component {
         name: "QDeclarativeCategory"
         prototype: "QObject"
@@ -95,7 +95,7 @@ Module {
         prototype: "QObject"
         exports: [
             "QtLocation/RouteManeuver 5.0",
-            "QtLocation/RouteManeuver 5.7"
+            "QtLocation/RouteManeuver 5.8"
         ]
         exportMetaObjectRevisions: [0, 0]
         Enum {
diff --git a/src/imports/positioning/plugins.qmltypes b/src/imports/positioning/plugins.qmltypes
index 55fcbba2..ace5bfae 100644
--- a/src/imports/positioning/plugins.qmltypes
+++ b/src/imports/positioning/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 QtPositioning 5.7'
+// 'qmlplugindump -nonrelocatable QtPositioning 5.8'
 
 Module {
-    dependencies: ["QtQuick 2.0"]
+    dependencies: ["QtQuick 2.8"]
     Component {
         name: "LocationSingleton"
         prototype: "QObject"
@@ -106,7 +106,7 @@ Module {
             "QtPositioning/Position 5.0",
             "QtPositioning/Position 5.3",
             "QtPositioning/Position 5.4",
-            "QtPositioning/Position 5.7"
+            "QtPositioning/Position 5.8"
         ]
         exportMetaObjectRevisions: [0, 1, 2, 2]
         Property { name: "latitudeValid"; type: "bool"; isReadonly: true }
diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp
index 31627c39..f00a4ae6 100644
--- a/src/imports/positioning/positioning.cpp
+++ b/src/imports/positioning/positioning.cpp
@@ -551,12 +551,12 @@ public:
             qmlRegisterType<QQuickGeoCoordinateAnimation  >(uri, major, minor, "CoordinateAnimation");
             qmlRegisterType<QDeclarativePosition, 1             >(uri, major, minor, "Position");
 
-            // Register the 5.4 types
-            // Introduction of 5.4 version; existing 5.3 exports become automatically available under 5.4
             minor = 4;
             qmlRegisterType<QDeclarativePosition, 2>(uri, major, minor, "Position");
 
-            minor = 7;
+            // Register the 5.8 types
+            // Introduction of 5.8 version; existing 5.4 exports become automatically available under 5.8
+            minor = 8;
             qmlRegisterType<QDeclarativePosition, 2>(uri, major, minor, "Position");
         } else {
             qDebug() << "Unsupported URI given to load positioning QML plugin: " << QLatin1String(uri);