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

Conflicts:
	.qmake.conf

Change-Id: I3241efba9c3a32a4a097a67fd6432c45aad8e6ef

1 files changed, 27 insertions, 3 deletions

diff --git a/src/imports/positioning/plugins.qmltypes b/src/imports/positioning/plugins.qmltypes
index ace5bfae..859736a1 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.8'
+// 'qmlplugindump -nonrelocatable QtPositioning 5.9'
 
 Module {
     dependencies: ["QtQuick 2.8"]
@@ -61,6 +61,18 @@ Module {
             type: "QGeoCircle"
             Parameter { name: "center"; type: "QGeoCoordinate" }
         }
+        Method { name: "path"; type: "QGeoPath" }
+        Method {
+            name: "path"
+            type: "QGeoPath"
+            Parameter { name: "value"; type: "QJSValue" }
+            Parameter { name: "width"; type: "double" }
+        }
+        Method {
+            name: "path"
+            type: "QGeoPath"
+            Parameter { name: "value"; type: "QJSValue" }
+        }
         Method {
             name: "shapeToCircle"
             type: "QGeoCircle"
@@ -71,6 +83,11 @@ Module {
             type: "QGeoRectangle"
             Parameter { name: "shape"; type: "QGeoShape" }
         }
+        Method {
+            name: "shapeToPath"
+            type: "QGeoPath"
+            Parameter { name: "shape"; type: "QGeoShape" }
+        }
     }
     Component {
         name: "QDeclarativeGeoAddress"
@@ -106,7 +123,7 @@ Module {
             "QtPositioning/Position 5.0",
             "QtPositioning/Position 5.3",
             "QtPositioning/Position 5.4",
-            "QtPositioning/Position 5.8"
+            "QtPositioning/Position 5.9"
         ]
         exportMetaObjectRevisions: [0, 1, 2, 2]
         Property { name: "latitudeValid"; type: "bool"; isReadonly: true }
@@ -191,7 +208,8 @@ Module {
             values: {
                 "UnknownType": 0,
                 "RectangleType": 1,
-                "CircleType": 2
+                "CircleType": 2,
+                "PathType": 3
             }
         }
         Property { name: "type"; type: "ShapeType"; isReadonly: true }
@@ -202,6 +220,12 @@ Module {
             type: "bool"
             Parameter { name: "coordinate"; type: "QGeoCoordinate" }
         }
+        Method { name: "boundingGeoRectangle"; type: "QGeoRectangle" }
+        Method { name: "center"; type: "QGeoCoordinate" }
+        Method {
+            name: "extendShape"
+            Parameter { name: "coordinate"; type: "QGeoCoordinate" }
+        }
         Method { name: "toString"; type: "string" }
     }
     Component {