Update qmltypes and revision for Qt 5.11 in Location and Positioning

Change-Id: Ie7493cbb33e656c270ef522fa26460461215e145
Reviewed-by: Kai Koehne <kai.koehne@qt.io>

8 files changed, 61 insertions, 27 deletions

diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index 45b104b9..183d11d3 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -183,8 +183,15 @@ public:
 
             // Register the 5.11 types
             minor = 11;
-            qmlRegisterType<QDeclarativeGeoWaypoint>(uri, major, minor, "Waypoint");
+            qmlRegisterType<QDeclarativeGeoManeuver, 11>(uri, major, minor, "RouteManeuver");
+            qmlRegisterType<QDeclarativeGeoMap, 11>(uri, major, minor, "Map");
+            qmlRegisterUncreatableType<QDeclarativeGeoMapItemBase, 11>(uri, major, minor, "GeoMapItemBase",
+                                        QStringLiteral("GeoMapItemBase is not intended instantiable by developer."));
             qmlRegisterType<QDeclarativeGeoMapParameter>(uri, major, minor, "DynamicParameter");
+            qmlRegisterType<QDeclarativeGeoRoute, 11>(uri, major, minor, "Route");
+            qmlRegisterType<QDeclarativeGeoRouteQuery, 11>(uri, major, minor, "RouteQuery");
+            qmlRegisterType<QDeclarativeGeoServiceProvider, 11>(uri, major, minor, "Plugin");
+            qmlRegisterType<QDeclarativeGeoWaypoint>(uri, major, minor, "Waypoint");
 
             // Register the latest Qt version as QML type version
             qmlRegisterModule(uri, QT_VERSION_MAJOR, QT_VERSION_MINOR);
diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes
index ed977c4a..341da896 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.10'
+// 'qmlplugindump -nonrelocatable QtLocation 5.11'
 
 Module {
     dependencies: ["QtQuick 2.8"]
@@ -108,9 +108,10 @@ Module {
         prototype: "QObject"
         exports: [
             "QtLocation/RouteManeuver 5.0",
+            "QtLocation/RouteManeuver 5.11",
             "QtLocation/RouteManeuver 5.8"
         ]
-        exportMetaObjectRevisions: [0, 0]
+        exportMetaObjectRevisions: [0, 11, 0]
         Enum {
             name: "Direction"
             values: {
@@ -136,14 +137,20 @@ Module {
         Property { name: "distanceToNextInstruction"; type: "double"; isReadonly: true }
         Property { name: "waypoint"; type: "QGeoCoordinate"; isReadonly: true }
         Property { name: "waypointValid"; type: "bool"; isReadonly: true }
-        Property { name: "extendedAttributes"; type: "QObject"; isReadonly: true; isPointer: true }
+        Property {
+            name: "extendedAttributes"
+            revision: 11
+            type: "QObject"
+            isReadonly: true
+            isPointer: true
+        }
     }
     Component {
         name: "QDeclarativeGeoMap"
         defaultProperty: "data"
         prototype: "QQuickItem"
-        exports: ["QtLocation/Map 5.0"]
-        exportMetaObjectRevisions: [0]
+        exports: ["QtLocation/Map 5.0", "QtLocation/Map 5.11"]
+        exportMetaObjectRevisions: [0, 11]
         Property { name: "gesture"; type: "QQuickGeoMapGestureArea"; isReadonly: true; isPointer: true }
         Property { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true }
         Property { name: "minimumZoomLevel"; type: "double" }
@@ -190,6 +197,7 @@ Module {
         }
         Signal {
             name: "copyrightsVisibleChanged"
+            revision: 11
             Parameter { name: "visible"; type: "bool" }
         }
         Signal {
@@ -236,7 +244,7 @@ Module {
             name: "mapReadyChanged"
             Parameter { name: "ready"; type: "bool" }
         }
-        Signal { name: "mapObjectsChanged" }
+        Signal { name: "mapObjectsChanged"; revision: 11 }
         Method {
             name: "setBearing"
             Parameter { name: "bearing"; type: "double" }
@@ -333,6 +341,7 @@ Module {
             name: "styleSheetChanged"
             Parameter { name: "styleSheet"; type: "string" }
         }
+        Signal { name: "copyrightsVisibleChanged" }
         Method {
             name: "copyrightsChanged"
             Parameter { name: "copyrightsImage"; type: "QImage" }
@@ -350,11 +359,16 @@ Module {
         name: "QDeclarativeGeoMapItemBase"
         defaultProperty: "data"
         prototype: "QQuickItem"
-        exports: ["QtLocation/GeoMapItemBase 5.0"]
+        exports: [
+            "QtLocation/GeoMapItemBase 5.0",
+            "QtLocation/GeoMapItemBase 5.11"
+        ]
         isCreatable: false
-        exportMetaObjectRevisions: [0]
+        exportMetaObjectRevisions: [0, 11]
         Property { name: "geoShape"; type: "QGeoShape"; isReadonly: true }
         Signal { name: "mapItemOpacityChanged" }
+        Signal { name: "enterTransitionFinished"; revision: 11 }
+        Signal { name: "exitTransitionFinished"; revision: 11 }
     }
     Component {
         name: "QDeclarativeGeoMapItemGroup"
@@ -375,8 +389,11 @@ Module {
     Component {
         name: "QDeclarativeGeoMapParameter"
         prototype: "QGeoMapParameter"
-        exports: ["QtLocation/MapParameter 5.9"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtLocation/DynamicParameter 5.11",
+            "QtLocation/MapParameter 5.9"
+        ]
+        exportMetaObjectRevisions: [0, 0]
         Signal {
             name: "completed"
             Parameter { type: "QDeclarativeGeoMapParameter"; isPointer: true }
@@ -432,13 +449,20 @@ Module {
     Component {
         name: "QDeclarativeGeoRoute"
         prototype: "QObject"
-        exports: ["QtLocation/Route 5.0"]
-        exportMetaObjectRevisions: [0]
+        exports: ["QtLocation/Route 5.0", "QtLocation/Route 5.11"]
+        exportMetaObjectRevisions: [0, 11]
         Property { name: "bounds"; type: "QGeoRectangle"; isReadonly: true }
         Property { name: "travelTime"; type: "int"; isReadonly: true }
         Property { name: "distance"; type: "double"; isReadonly: true }
         Property { name: "path"; type: "QJSValue" }
         Property { name: "segments"; type: "QDeclarativeGeoRouteSegment"; isList: true; isReadonly: true }
+        Property {
+            name: "routeQuery"
+            revision: 11
+            type: "QDeclarativeGeoRouteQuery"
+            isReadonly: true
+            isPointer: true
+        }
     }
     Component {
         name: "QDeclarativeGeoRouteModel"
@@ -490,8 +514,8 @@ Module {
         name: "QDeclarativeGeoRouteQuery"
         defaultProperty: "quickChildren"
         prototype: "QObject"
-        exports: ["QtLocation/RouteQuery 5.0"]
-        exportMetaObjectRevisions: [0]
+        exports: ["QtLocation/RouteQuery 5.0", "QtLocation/RouteQuery 5.11"]
+        exportMetaObjectRevisions: [0, 11]
         Enum {
             name: "TravelMode"
             values: {
@@ -591,9 +615,10 @@ Module {
         Property { name: "waypoints"; type: "QVariantList" }
         Property { name: "excludedAreas"; type: "QJSValue" }
         Property { name: "featureTypes"; type: "QList<int>"; isReadonly: true }
+        Property { name: "extraParameters"; revision: 11; type: "QVariantMap"; isReadonly: true }
         Property { name: "quickChildren"; type: "QObject"; isList: true; isReadonly: true }
         Signal { name: "queryDetailsChanged" }
-        Signal { name: "extraParametersChanged" }
+        Signal { name: "extraParametersChanged"; revision: 11 }
         Method { name: "waypointObjects"; type: "QVariantList" }
         Method {
             name: "addWaypoint"
@@ -639,8 +664,8 @@ Module {
         name: "QDeclarativeGeoServiceProvider"
         defaultProperty: "parameters"
         prototype: "QObject"
-        exports: ["QtLocation/Plugin 5.0"]
-        exportMetaObjectRevisions: [0]
+        exports: ["QtLocation/Plugin 5.0", "QtLocation/Plugin 5.11"]
+        exportMetaObjectRevisions: [0, 11]
         Enum {
             name: "RoutingFeature"
             values: {
@@ -810,10 +835,11 @@ Module {
         Method { name: "supportsPlaces"; type: "bool" }
         Method {
             name: "supportsNavigation"
+            revision: 11
             type: "bool"
             Parameter { name: "feature"; type: "NavigationFeature" }
         }
-        Method { name: "supportsNavigation"; type: "bool" }
+        Method { name: "supportsNavigation"; revision: 11; type: "bool" }
     }
     Component {
         name: "QDeclarativeGeoServiceProviderParameter"
@@ -876,6 +902,7 @@ Module {
         Property { name: "altitude"; type: "double" }
         Property { name: "isValid"; type: "bool"; isReadonly: true }
         Property { name: "bearing"; type: "double" }
+        Property { name: "metadata"; type: "QVariantMap"; isReadonly: true }
         Property { name: "quickChildren"; type: "QObject"; isList: true; isReadonly: true }
         Signal { name: "completed" }
         Signal { name: "waypointDetailsChanged" }
diff --git a/src/imports/positioning/plugins.qmltypes b/src/imports/positioning/plugins.qmltypes
index d9791c6d..dab72802 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.10'
+// 'qmlplugindump -nonrelocatable QtPositioning 5.11'
 
 Module {
     dependencies: ["QtQuick 2.8"]
diff --git a/src/location/declarativemaps/qdeclarativegeomaneuver_p.h b/src/location/declarativemaps/qdeclarativegeomaneuver_p.h
index f321c133..4c79aa80 100644
--- a/src/location/declarativemaps/qdeclarativegeomaneuver_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomaneuver_p.h
@@ -71,7 +71,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoManeuver : public QObject
     Q_PROPERTY(qreal distanceToNextInstruction READ distanceToNextInstruction CONSTANT)
     Q_PROPERTY(QGeoCoordinate waypoint READ waypoint CONSTANT)
     Q_PROPERTY(bool waypointValid READ waypointValid CONSTANT)
-    Q_PROPERTY(QObject *extendedAttributes READ extendedAttributes NOTIFY extendedAttributesChanged)
+    Q_PROPERTY(QObject *extendedAttributes READ extendedAttributes NOTIFY extendedAttributesChanged REVISION 11)
 
 public:
     enum Direction {
diff --git a/src/location/declarativemaps/qdeclarativegeomap_p.h b/src/location/declarativemaps/qdeclarativegeomap_p.h
index cb8fed08..af08a953 100644
--- a/src/location/declarativemaps/qdeclarativegeomap_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomap_p.h
@@ -213,7 +213,7 @@ Q_SIGNALS:
     void mapItemsChanged();
     void errorChanged();
     void copyrightLinkActivated(const QString &link);
-    void copyrightsVisibleChanged(bool visible);
+    Q_REVISION(11) void copyrightsVisibleChanged(bool visible);
     void colorChanged(const QColor &color);
     void bearingChanged(qreal bearing);
     void tiltChanged(qreal tilt);
@@ -225,7 +225,7 @@ Q_SIGNALS:
     void copyrightsChanged(const QImage &copyrightsImage);
     void copyrightsChanged(const QString &copyrightsHtml);
     void mapReadyChanged(bool ready);
-    void mapObjectsChanged();
+    Q_REVISION(11) void mapObjectsChanged();
 
 protected:
     void mousePressEvent(QMouseEvent *event) override ;
diff --git a/src/location/declarativemaps/qdeclarativegeoroute_p.h b/src/location/declarativemaps/qdeclarativegeoroute_p.h
index 5fe29862..7e7ae368 100644
--- a/src/location/declarativemaps/qdeclarativegeoroute_p.h
+++ b/src/location/declarativemaps/qdeclarativegeoroute_p.h
@@ -67,7 +67,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoRoute : public QObject
     Q_PROPERTY(qreal distance READ distance CONSTANT)
     Q_PROPERTY(QJSValue path READ path WRITE setPath NOTIFY pathChanged)
     Q_PROPERTY(QQmlListProperty<QDeclarativeGeoRouteSegment> segments READ segments CONSTANT)
-    Q_PROPERTY(QDeclarativeGeoRouteQuery *routeQuery READ routeQuery)
+    Q_PROPERTY(QDeclarativeGeoRouteQuery *routeQuery READ routeQuery REVISION 11)
 
 public:
     explicit QDeclarativeGeoRoute(QObject *parent = 0);
diff --git a/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h b/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h
index 64c1ebf8..afffc21a 100644
--- a/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h
+++ b/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h
@@ -295,7 +295,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoRouteQuery : public QObject, publ
     Q_PROPERTY(QVariantList waypoints READ waypoints WRITE setWaypoints NOTIFY waypointsChanged)
     Q_PROPERTY(QJSValue excludedAreas READ excludedAreas WRITE setExcludedAreas NOTIFY excludedAreasChanged)
     Q_PROPERTY(QList<int> featureTypes READ featureTypes NOTIFY featureTypesChanged)
-    Q_PROPERTY(QVariantMap extraParameters READ extraParameters)
+    Q_PROPERTY(QVariantMap extraParameters READ extraParameters REVISION 11)
     Q_PROPERTY(QQmlListProperty<QObject> quickChildren READ declarativeChildren DESIGNABLE false)
     Q_CLASSINFO("DefaultProperty", "quickChildren")
     Q_INTERFACES(QQmlParserStatus)
@@ -434,7 +434,7 @@ Q_SIGNALS:
     void segmentDetailChanged();
 
     void queryDetailsChanged();
-    void extraParametersChanged();
+    Q_REVISION(11) void extraParametersChanged();
 
 private Q_SLOTS:
     void excludedAreaCoordinateChanged();
diff --git a/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h b/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h
index 13768411..f6a663f3 100644
--- a/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h
+++ b/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h
@@ -206,7 +206,7 @@ public:
     Q_INVOKABLE bool supportsGeocoding(const GeocodingFeatures &feature = AnyGeocodingFeatures) const;
     Q_INVOKABLE bool supportsMapping(const MappingFeatures &feature = AnyMappingFeatures) const;
     Q_INVOKABLE bool supportsPlaces(const PlacesFeatures &feature = AnyPlacesFeatures) const;
-    Q_INVOKABLE bool supportsNavigation(const NavigationFeature &feature = AnyNavigationFeatures) const;
+    Q_REVISION(11) Q_INVOKABLE bool supportsNavigation(const NavigationFeature &feature = AnyNavigationFeatures) const;
 
     QStringList locales() const;
     void setLocales(const QStringList &locales);