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

Change-Id: Ibe88e68076fc3a722432c07fe4c0358f0bb032ea

1 files changed, 49 insertions, 14 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 {