Update QML version to 5.7 for QtPositioning and QtLocation

Change-Id: Ibbd06c3bc6c2c745a8e2fc6ee12a974bb40bf80a
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>

4 files changed, 17 insertions, 9 deletions

diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index f299d153..b42933f0 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -153,9 +153,6 @@ public:
             // Introduction of 5.3 version; existing 5.0 exports automatically become available under 5.3 as well
             // 5.3 is committed QML API despite missing release of QtLocation 5.3
 
-            // Register the 5.5 types
-            // Implicitly registers 5.3 & 5.4
-
             minor = 5;
             //TODO: this is broken QTBUG-50990
             qmlRegisterUncreatableType<QDeclarativeGeoMapType, 1>(uri, major, minor, "MapType",
@@ -165,6 +162,9 @@ public:
             qmlRegisterUncreatableType<QQuickGeoMapGestureArea, 1>(uri, major, minor, "MapGestureArea",
                                         QStringLiteral("(Map)GestureArea is not intended instantiable by developer."));
 
+            // Register the 5.7 types
+            minor = 7;
+            qmlRegisterType<QDeclarativeGeoManeuver>(uri, major, minor, "RouteManeuver");
 
             //registrations below are version independent
             qRegisterMetaType<QPlaceCategory>();
diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes
index 61a1cd28..4e8749da 100644
--- a/src/imports/location/plugins.qmltypes
+++ b/src/imports/location/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 QtLocation 5.6'
+// 'qmlplugindump -nonrelocatable QtLocation 5.7'
 
 Module {
     dependencies: ["QtQuick 2.0"]
@@ -93,8 +93,11 @@ Module {
     Component {
         name: "QDeclarativeGeoManeuver"
         prototype: "QObject"
-        exports: ["QtLocation/RouteManeuver 5.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtLocation/RouteManeuver 5.0",
+            "QtLocation/RouteManeuver 5.7"
+        ]
+        exportMetaObjectRevisions: [0, 0]
         Enum {
             name: "Direction"
             values: {
@@ -144,6 +147,7 @@ Module {
         Property { name: "error"; type: "QGeoServiceProvider::Error"; isReadonly: true }
         Property { name: "errorString"; type: "string"; isReadonly: true }
         Property { name: "visibleRegion"; type: "QGeoShape" }
+        Property { name: "copyrightsVisible"; type: "bool" }
         Property { name: "color"; type: "QColor" }
         Signal {
             name: "pluginChanged"
@@ -162,6 +166,10 @@ Module {
             Parameter { name: "link"; type: "string" }
         }
         Signal {
+            name: "copyrightsVisibleChanged"
+            Parameter { name: "visible"; type: "bool" }
+        }
+        Signal {
             name: "colorChanged"
             Parameter { name: "color"; type: "QColor" }
         }
diff --git a/src/imports/positioning/plugins.qmltypes b/src/imports/positioning/plugins.qmltypes
index c3451c2a..55fcbba2 100644
--- a/src/imports/positioning/plugins.qmltypes
+++ b/src/imports/positioning/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 QtPositioning 5.6'
+// 'qmlplugindump -nonrelocatable QtPositioning 5.7'
 
 Module {
     dependencies: ["QtQuick 2.0"]
@@ -106,7 +106,7 @@ Module {
             "QtPositioning/Position 5.0",
             "QtPositioning/Position 5.3",
             "QtPositioning/Position 5.4",
-            "QtPositioning/Position 5.6"
+            "QtPositioning/Position 5.7"
         ]
         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 8a4fef47..5137da22 100644
--- a/src/imports/positioning/positioning.cpp
+++ b/src/imports/positioning/positioning.cpp
@@ -553,7 +553,7 @@ public:
             minor = 4;
             qmlRegisterType<QDeclarativePosition, 2>(uri, major, minor, "Position");
 
-            minor = 6;
+            minor = 7;
             qmlRegisterType<QDeclarativePosition, 2>(uri, major, minor, "Position");
         } else {
             qDebug() << "Unsupported URI given to load positioning QML plugin: " << QLatin1String(uri);