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

 Conflicts:
	.qmake.conf
	src/imports/location/location.cpp
	src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp

Change-Id: I0c1ce33cff7bb1a65e65b8adafd2b31eb936d515

2 files changed, 49 insertions, 3 deletions

diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index 818ba709..73700f7a 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -184,6 +184,9 @@ public:
             minor = 3;
             qmlRegisterType<QDeclarativeGeoWaypoint>(uri, major, minor, "Waypoint");
 
+            // Register the latest Qt version as QML type version
+            qmlRegisterModule(uri, QT_VERSION_MAJOR, QT_VERSION_MINOR);
+
             //registrations below are version independent
             qRegisterMetaType<QPlaceCategory>();
             qRegisterMetaType<QPlace>();
diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes
index e866cac7..db6c09f3 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.9'
+// 'qmlplugindump -nonrelocatable QtLocation 5.10'
 
 Module {
     dependencies: ["QtQuick 2.8"]
@@ -91,6 +91,19 @@ Module {
         exportMetaObjectRevisions: [0]
     }
     Component {
+        name: "QDeclarativeGeoCameraCapabilities"
+        prototype: "QObject"
+        exports: ["QtLocation/CameraCapabilities 5.10"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property { name: "minimumZoomLevel"; type: "double"; isReadonly: true }
+        Property { name: "maximumZoomLevel"; type: "double"; isReadonly: true }
+        Property { name: "minimumTilt"; type: "double"; isReadonly: true }
+        Property { name: "maximumTilt"; type: "double"; isReadonly: true }
+        Property { name: "minimumFieldOfView"; type: "double"; isReadonly: true }
+        Property { name: "maximumFieldOfView"; type: "double"; isReadonly: true }
+    }
+    Component {
         name: "QDeclarativeGeoManeuver"
         prototype: "QObject"
         exports: [
@@ -223,6 +236,16 @@ Module {
             Parameter { name: "ready"; type: "bool" }
         }
         Method {
+            name: "setBearing"
+            Parameter { name: "bearing"; type: "double" }
+            Parameter { name: "coordinate"; type: "QGeoCoordinate" }
+        }
+        Method {
+            name: "alignCoordinateToPoint"
+            Parameter { name: "coordinate"; type: "QGeoCoordinate" }
+            Parameter { name: "point"; type: "QPointF" }
+        }
+        Method {
             name: "removeMapItem"
             Parameter { name: "item"; type: "QDeclarativeGeoMapItemBase"; isPointer: true }
         }
@@ -238,6 +261,14 @@ Module {
             name: "removeMapItemGroup"
             Parameter { name: "itemGroup"; type: "QDeclarativeGeoMapItemGroup"; isPointer: true }
         }
+        Method {
+            name: "removeMapItemView"
+            Parameter { name: "itemView"; type: "QDeclarativeGeoMapItemView"; isPointer: true }
+        }
+        Method {
+            name: "addMapItemView"
+            Parameter { name: "itemView"; type: "QDeclarativeGeoMapItemView"; isPointer: true }
+        }
         Method { name: "clearMapItems" }
         Method {
             name: "addMapParameter"
@@ -388,6 +419,13 @@ Module {
         Property { name: "description"; type: "string"; isReadonly: true }
         Property { name: "mobile"; type: "bool"; isReadonly: true }
         Property { name: "night"; revision: 1; type: "bool"; isReadonly: true }
+        Property {
+            name: "cameraCapabilities"
+            type: "QDeclarativeGeoCameraCapabilities"
+            isReadonly: true
+            isPointer: true
+        }
+        Property { name: "metadata"; type: "QVariantMap"; isReadonly: true }
     }
     Component {
         name: "QDeclarativeGeoRoute"
@@ -482,7 +520,8 @@ Module {
                 "TunnelFeature": 16,
                 "DirtRoadFeature": 32,
                 "ParksFeature": 64,
-                "MotorPoolLaneFeature": 128
+                "MotorPoolLaneFeature": 128,
+                "TrafficFeature": 256
             }
         }
         Enum {
@@ -711,7 +750,6 @@ Module {
         Property {
             name: "required"
             type: "QDeclarativeGeoServiceProviderRequirements"
-            isReadonly: true
             isPointer: true
         }
         Property { name: "locales"; type: "QStringList" }
@@ -771,6 +809,7 @@ Module {
             name: "valueChanged"
             Parameter { name: "value"; type: "QVariant" }
         }
+        Signal { name: "initialized" }
     }
     Component {
         name: "QDeclarativeGeoServiceProviderRequirements"
@@ -1067,6 +1106,10 @@ Module {
             name: "removeCoordinate"
             Parameter { name: "index"; type: "int" }
         }
+        Method {
+            name: "setPath"
+            Parameter { name: "path"; type: "QGeoPath" }
+        }
     }
     Component {
         name: "QDeclarativeRatings"