Update plugins.qmltypes

Task-number: QTBUG-70264
Change-Id: I2922b855d08e42bbd771cc959ea9b6e97eed60b9
Reviewed-by: Kai Koehne <kai.koehne@qt.io>

5 files changed, 172 insertions, 26 deletions

diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes
index d2d9030a..c7ab0e69 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.11'
+// 'qmlplugindump -nonrelocatable QtLocation 5.12'
 
 Module {
-    dependencies: ["QtQuick 2.8"]
+    dependencies: ["QtQuick 2.12"]
     Component {
         name: "QDeclarativeCategory"
         prototype: "QObject"
@@ -149,8 +149,12 @@ Module {
         name: "QDeclarativeGeoMap"
         defaultProperty: "data"
         prototype: "QQuickItem"
-        exports: ["QtLocation/Map 5.0", "QtLocation/Map 5.11"]
-        exportMetaObjectRevisions: [0, 11]
+        exports: [
+            "QtLocation/Map 5.0",
+            "QtLocation/Map 5.11",
+            "QtLocation/Map 5.12"
+        ]
+        exportMetaObjectRevisions: [0, 11, 12]
         Property { name: "gesture"; type: "QQuickGeoMapGestureArea"; isReadonly: true; isPointer: true }
         Property { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true }
         Property { name: "minimumZoomLevel"; type: "double" }
@@ -179,6 +183,7 @@ Module {
         Property { name: "copyrightsVisible"; type: "bool" }
         Property { name: "color"; type: "QColor" }
         Property { name: "mapReady"; type: "bool"; isReadonly: true }
+        Property { name: "visibleArea"; revision: 12; type: "QRectF" }
         Signal {
             name: "pluginChanged"
             Parameter { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true }
@@ -364,10 +369,10 @@ Module {
         ]
         isCreatable: false
         exportMetaObjectRevisions: [0, 11]
-        Property { name: "geoShape"; type: "QGeoShape"; isReadonly: true }
+        Property { name: "geoShape"; type: "QGeoShape" }
         Signal { name: "mapItemOpacityChanged" }
-        Signal { name: "enterTransitionFinished"; revision: 11 }
-        Signal { name: "exitTransitionFinished"; revision: 11 }
+        Signal { name: "addTransitionFinished"; revision: 12 }
+        Signal { name: "removeTransitionFinished"; revision: 12 }
     }
     Component {
         name: "QDeclarativeGeoMapItemGroup"
@@ -375,15 +380,23 @@ Module {
         prototype: "QQuickItem"
         exports: ["QtLocation/MapItemGroup 5.9"]
         exportMetaObjectRevisions: [0]
+        Signal { name: "mapItemOpacityChanged" }
+        Signal { name: "addTransitionFinished" }
+        Signal { name: "removeTransitionFinished" }
     }
     Component {
         name: "QDeclarativeGeoMapItemView"
-        prototype: "QObject"
-        exports: ["QtLocation/MapItemView 5.0"]
-        exportMetaObjectRevisions: [0]
+        defaultProperty: "data"
+        prototype: "QDeclarativeGeoMapItemGroup"
+        exports: ["QtLocation/MapItemView 5.0", "QtLocation/MapItemView 5.12"]
+        exportMetaObjectRevisions: [0, 12]
         Property { name: "model"; type: "QVariant" }
         Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
         Property { name: "autoFitViewport"; type: "bool" }
+        Property { name: "add"; revision: 12; type: "QQuickTransition"; isPointer: true }
+        Property { name: "remove"; revision: 12; type: "QQuickTransition"; isPointer: true }
+        Property { name: "mapItems"; revision: 12; type: "QList<QQuickItem*>"; isReadonly: true }
+        Property { name: "incubateDelegates"; revision: 12; type: "bool" }
     }
     Component {
         name: "QDeclarativeGeoMapParameter"
@@ -448,8 +461,12 @@ Module {
     Component {
         name: "QDeclarativeGeoRoute"
         prototype: "QObject"
-        exports: ["QtLocation/Route 5.0", "QtLocation/Route 5.11"]
-        exportMetaObjectRevisions: [0, 11]
+        exports: [
+            "QtLocation/Route 5.0",
+            "QtLocation/Route 5.11",
+            "QtLocation/Route 5.12"
+        ]
+        exportMetaObjectRevisions: [0, 11, 12]
         Property { name: "bounds"; type: "QGeoRectangle"; isReadonly: true }
         Property { name: "travelTime"; type: "int"; isReadonly: true }
         Property { name: "distance"; type: "double"; isReadonly: true }
@@ -462,6 +479,20 @@ Module {
             isReadonly: true
             isPointer: true
         }
+        Property { name: "legs"; revision: 12; type: "QList<QObject*>"; isReadonly: true }
+        Method {
+            name: "equals"
+            type: "bool"
+            Parameter { name: "other"; type: "QDeclarativeGeoRoute"; isPointer: true }
+        }
+    }
+    Component {
+        name: "QDeclarativeGeoRouteLeg"
+        prototype: "QDeclarativeGeoRoute"
+        exports: ["QtLocation/RouteLeg 5.12"]
+        exportMetaObjectRevisions: [12]
+        Property { name: "legIndex"; type: "int"; isReadonly: true }
+        Property { name: "overallRoute"; type: "QObject"; isReadonly: true; isPointer: true }
     }
     Component {
         name: "QDeclarativeGeoRouteModel"
@@ -1258,8 +1289,11 @@ Module {
     Component {
         name: "QDeclarativeSearchResultModel"
         prototype: "QDeclarativeSearchModelBase"
-        exports: ["QtLocation/PlaceSearchModel 5.0"]
-        exportMetaObjectRevisions: [0]
+        exports: [
+            "QtLocation/PlaceSearchModel 5.0",
+            "QtLocation/PlaceSearchModel 5.12"
+        ]
+        exportMetaObjectRevisions: [0, 12]
         Enum {
             name: "SearchResultType"
             values: {
@@ -1284,6 +1318,7 @@ Module {
         Property { name: "count"; type: "int"; isReadonly: true }
         Property { name: "favoritesPlugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true }
         Property { name: "favoritesMatchParameters"; type: "QVariantMap" }
+        Property { name: "incremental"; revision: 12; type: "bool" }
         Signal { name: "rowCountChanged" }
         Signal { name: "dataChanged" }
         Method {
diff --git a/src/imports/locationlabs/locationlabs.cpp b/src/imports/locationlabs/locationlabs.cpp
index 6f3b6dd1..cebdf0e4 100644
--- a/src/imports/locationlabs/locationlabs.cpp
+++ b/src/imports/locationlabs/locationlabs.cpp
@@ -74,9 +74,6 @@ public:
             qmlRegisterType<QMapPolygonObject>(uri, major, minor, "MapPolygonObject");
             qmlRegisterType<QMapPolylineObject>(uri, major, minor, "MapPolylineObject");
             qmlRegisterType<QDeclarativeNavigator>(uri, major, minor, "Navigator");
-
-            // Register the latest Qt version as QML type version
-            qmlRegisterModule(uri, QT_VERSION_MAJOR, QT_VERSION_MINOR);
         } else {
             qDebug() << "Unsupported URI given to load location QML plugin: " << QLatin1String(uri);
         }
diff --git a/src/imports/locationlabs/locationlabs.pro b/src/imports/locationlabs/locationlabs.pro
index db7f5ec2..2fcc1adc 100644
--- a/src/imports/locationlabs/locationlabs.pro
+++ b/src/imports/locationlabs/locationlabs.pro
@@ -3,7 +3,7 @@ QT += quick-private network positioning-private location-private qml-private cor
 TARGET = locationlabsplugin
 CXX_MODULE = $$TARGET
 TARGETPATH = Qt/labs/location
-IMPORT_VERSION = 5.11
+IMPORT_VERSION = 1.0
 
 SOURCES += \
            locationlabs.cpp
diff --git a/src/imports/locationlabs/plugins.qmltypes b/src/imports/locationlabs/plugins.qmltypes
index d5e30c38..e985e844 100644
--- a/src/imports/locationlabs/plugins.qmltypes
+++ b/src/imports/locationlabs/plugins.qmltypes
@@ -4,10 +4,43 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable Qt.labs.location 5.11'
+// 'qmlplugindump -nonrelocatable Qt.labs.location 1.0'
 
 Module {
-    dependencies: ["QtQuick 2.8"]
+    dependencies: ["QtQuick 2.11"]
+    Component {
+        name: "QDeclarativeNavigator"
+        defaultProperty: "quickChildren"
+        prototype: "QParameterizableObject"
+        exports: ["Qt.labs.location/Navigator 1.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true }
+        Property { name: "map"; type: "QDeclarativeGeoMap"; isPointer: true }
+        Property { name: "route"; type: "QDeclarativeGeoRoute"; isPointer: true }
+        Property { name: "positionSource"; type: "QDeclarativePositionSource"; isPointer: true }
+        Property { name: "active"; type: "bool" }
+        Property { name: "navigatorReady"; type: "bool"; isReadonly: true }
+        Property { name: "trackPositionSource"; type: "bool" }
+        Property { name: "currentRoute"; type: "QDeclarativeGeoRoute"; isReadonly: true; isPointer: true }
+        Property { name: "currentSegment"; type: "int"; isReadonly: true }
+        Signal {
+            name: "navigatorReadyChanged"
+            Parameter { name: "ready"; type: "bool" }
+        }
+        Signal {
+            name: "trackPositionSourceChanged"
+            Parameter { name: "trackPositionSource"; type: "bool" }
+        }
+        Signal {
+            name: "activeChanged"
+            Parameter { name: "active"; type: "bool" }
+        }
+        Signal {
+            name: "waypointReached"
+            Parameter { name: "pos"; type: "const QDeclarativeGeoWaypoint"; isPointer: true }
+        }
+        Signal { name: "destinationReached" }
+    }
     Component {
         name: "QGeoMapObject"
         defaultProperty: "quickChildren"
@@ -32,10 +65,44 @@ Module {
         Signal { name: "completed" }
     }
     Component {
+        name: "QMapCircleObject"
+        defaultProperty: "quickChildren"
+        prototype: "QGeoMapObject"
+        exports: ["Qt.labs.location/MapCircleObject 1.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "center"; type: "QGeoCoordinate" }
+        Property { name: "radius"; type: "double" }
+        Property { name: "color"; type: "QColor" }
+        Property {
+            name: "border"
+            type: "QDeclarativeMapLineProperties"
+            isReadonly: true
+            isPointer: true
+        }
+    }
+    Component {
+        name: "QMapIconObject"
+        defaultProperty: "quickChildren"
+        prototype: "QGeoMapObject"
+        exports: ["Qt.labs.location/MapIconObject 1.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "coordinate"; type: "QGeoCoordinate" }
+        Property { name: "content"; type: "QVariant" }
+        Property { name: "size"; type: "QSizeF" }
+        Signal {
+            name: "contentChanged"
+            Parameter { name: "content"; type: "QVariant" }
+        }
+        Signal {
+            name: "coordinateChanged"
+            Parameter { name: "coordinate"; type: "QGeoCoordinate" }
+        }
+    }
+    Component {
         name: "QMapObjectView"
         defaultProperty: "quickChildren"
         prototype: "QGeoMapObject"
-        exports: ["Qt.labs.location/MapObjectView 5.11"]
+        exports: ["Qt.labs.location/MapObjectView 1.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "model"; type: "QVariant" }
         Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
@@ -57,10 +124,39 @@ Module {
         }
     }
     Component {
+        name: "QMapPolygonObject"
+        defaultProperty: "quickChildren"
+        prototype: "QGeoMapObject"
+        exports: ["Qt.labs.location/MapPolygonObject 1.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "path"; type: "QVariantList" }
+        Property { name: "color"; type: "QColor" }
+        Property {
+            name: "border"
+            type: "QDeclarativeMapLineProperties"
+            isReadonly: true
+            isPointer: true
+        }
+    }
+    Component {
+        name: "QMapPolylineObject"
+        defaultProperty: "quickChildren"
+        prototype: "QGeoMapObject"
+        exports: ["Qt.labs.location/MapPolylineObject 1.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "path"; type: "QVariantList" }
+        Property {
+            name: "line"
+            type: "QDeclarativeMapLineProperties"
+            isReadonly: true
+            isPointer: true
+        }
+    }
+    Component {
         name: "QMapRouteObject"
         defaultProperty: "quickChildren"
         prototype: "QGeoMapObject"
-        exports: ["Qt.labs.location/MapRouteObject 5.11"]
+        exports: ["Qt.labs.location/MapRouteObject 1.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "route"; type: "QDeclarativeGeoRoute"; isPointer: true }
         Signal {
diff --git a/src/imports/positioning/plugins.qmltypes b/src/imports/positioning/plugins.qmltypes
index dab72802..c599d841 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.11'
+// 'qmlplugindump -nonrelocatable QtPositioning 5.12'
 
 Module {
-    dependencies: ["QtQuick 2.8"]
+    dependencies: ["QtQuick 2.12"]
     Component {
         name: "LocationSingleton"
         prototype: "QObject"
@@ -73,13 +73,19 @@ Module {
             type: "QGeoPath"
             Parameter { name: "value"; type: "QJSValue" }
         }
-        Method { name: "polygon"; type: "QGeoPath" }
+        Method { name: "polygon"; type: "QGeoPolygon" }
         Method {
             name: "polygon"
-            type: "QGeoPath"
+            type: "QGeoPolygon"
             Parameter { name: "value"; type: "QVariantList" }
         }
         Method {
+            name: "polygon"
+            type: "QGeoPolygon"
+            Parameter { name: "perimeter"; type: "QVariantList" }
+            Parameter { name: "holes"; type: "QVariantList" }
+        }
+        Method {
             name: "shapeToCircle"
             type: "QGeoCircle"
             Parameter { name: "shape"; type: "QGeoShape" }
@@ -99,6 +105,18 @@ Module {
             type: "QGeoPolygon"
             Parameter { name: "shape"; type: "QGeoShape" }
         }
+        Method {
+            name: "mercatorToCoord"
+            revision: 12
+            type: "QGeoCoordinate"
+            Parameter { name: "mercator"; type: "QPointF" }
+        }
+        Method {
+            name: "coordToMercator"
+            revision: 12
+            type: "QPointF"
+            Parameter { name: "coord"; type: "QGeoCoordinate" }
+        }
     }
     Component {
         name: "QDeclarativeGeoAddress"