Always step QML versions when Qt steps a version

Change-Id: I2b9751dcdcee4a5d8d3353bfc2fcc43cd995b584
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>

2 files changed, 18 insertions, 9 deletions

diff --git a/src/imports/positioning/plugins.qmltypes b/src/imports/positioning/plugins.qmltypes
index 859736a1..d9791c6d 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.9'
+// 'qmlplugindump -nonrelocatable QtPositioning 5.10'
 
 Module {
     dependencies: ["QtQuick 2.8"]
@@ -73,6 +73,12 @@ Module {
             type: "QGeoPath"
             Parameter { name: "value"; type: "QJSValue" }
         }
+        Method { name: "polygon"; type: "QGeoPath" }
+        Method {
+            name: "polygon"
+            type: "QGeoPath"
+            Parameter { name: "value"; type: "QVariantList" }
+        }
         Method {
             name: "shapeToCircle"
             type: "QGeoCircle"
@@ -88,6 +94,11 @@ Module {
             type: "QGeoPath"
             Parameter { name: "shape"; type: "QGeoShape" }
         }
+        Method {
+            name: "shapeToPolygon"
+            type: "QGeoPolygon"
+            Parameter { name: "shape"; type: "QGeoShape" }
+        }
     }
     Component {
         name: "QDeclarativeGeoAddress"
@@ -122,10 +133,9 @@ Module {
         exports: [
             "QtPositioning/Position 5.0",
             "QtPositioning/Position 5.3",
-            "QtPositioning/Position 5.4",
-            "QtPositioning/Position 5.9"
+            "QtPositioning/Position 5.4"
         ]
-        exportMetaObjectRevisions: [0, 1, 2, 2]
+        exportMetaObjectRevisions: [0, 1, 2]
         Property { name: "latitudeValid"; type: "bool"; isReadonly: true }
         Property { name: "longitudeValid"; type: "bool"; isReadonly: true }
         Property { name: "altitudeValid"; type: "bool"; isReadonly: true }
@@ -209,7 +219,8 @@ Module {
                 "UnknownType": 0,
                 "RectangleType": 1,
                 "CircleType": 2,
-                "PathType": 3
+                "PathType": 3,
+                "PolygonType": 4
             }
         }
         Property { name: "type"; type: "ShapeType"; isReadonly: true }
diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp
index 585445b5..e25cf688 100644
--- a/src/imports/positioning/positioning.cpp
+++ b/src/imports/positioning/positioning.cpp
@@ -586,10 +586,8 @@ public:
             minor = 4;
             qmlRegisterType<QDeclarativePosition, 2>(uri, major, minor, "Position");
 
-            // Register the 5.9 types
-            // Introduction of 5.9 version; existing 5.4 exports become automatically available under 5.9
-            minor = 9;
-            qmlRegisterType<QDeclarativePosition, 2>(uri, major, minor, "Position");
+            // Register the latest Qt version as QML type version
+            qmlRegisterModule(uri, QT_VERSION_MAJOR, QT_VERSION_MINOR);
         } else {
             qDebug() << "Unsupported URI given to load positioning QML plugin: " << QLatin1String(uri);
         }