Prepare QtLocation & QtPositioning QML type definition for Qt 5.5

The GeoShape is compatibile as the class name changes but
the functionality and naming is the same in QML.

The QtLocation changes are additions which become available
and Qt 5.5. is the first official release anyway. Hence
the normal rules about \since do not apply.

Change-Id: I41d8afea955001845ab143535f6653fce715b9d8
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>

4 files changed, 48 insertions, 33 deletions

diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index 68a35c4a..58d5296b 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -142,10 +142,9 @@ public:
             // Introduction of 5.3 version; existing 5.0 exports automatically become available under 5.3 as well
             // 5.3 is committed QML API despite missing release of QtLocation 5.3
 
-            // Register the 5.4 types
-            // Implicitly registers 5.3
-            minor = 4;
-            // For now there are no new types; just reregister one existing 5.0 type
+            // Register the 5.5 types
+            // Implicitly registers 5.3 & 5.4
+            minor = 5;
             qmlRegisterUncreatableType<QDeclarativeGeoMapType, 1>(uri, major, minor, "MapType",
                                         QStringLiteral("MapType is not intended instantiable by developer."));
 
diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes
index 0a7c6334..9858cb3e 100644
--- a/src/imports/location/plugins.qmltypes
+++ b/src/imports/location/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtLocation 5.4'
+// 'qmlplugindump -nonrelocatable QtLocation 5.5'
 
 Module {
     Component {
@@ -145,6 +145,8 @@ Module {
         }
         Property { name: "center"; type: "QGeoCoordinate" }
         Property { name: "mapItems"; type: "QList<QObject*>"; isReadonly: true }
+        Property { name: "error"; type: "QGeoServiceProvider::Error"; isReadonly: true }
+        Property { name: "errorString"; type: "string"; isReadonly: true }
         Signal {
             name: "wheelAngleChanged"
             Parameter { name: "angleDelta"; type: "QPoint" }
@@ -161,6 +163,10 @@ Module {
             name: "centerChanged"
             Parameter { name: "coordinate"; type: "QGeoCoordinate" }
         }
+        Signal {
+            name: "copyrightLinkActivated"
+            Parameter { name: "link"; type: "string" }
+        }
         Method {
             name: "removeMapItem"
             Parameter { name: "item"; type: "QDeclarativeGeoMapItemBase"; isPointer: true }
@@ -173,7 +179,12 @@ Module {
         Method {
             name: "toCoordinate"
             type: "QGeoCoordinate"
-            Parameter { name: "screenPosition"; type: "QPointF" }
+            Parameter { name: "position"; type: "QPointF" }
+        }
+        Method {
+            name: "fromCoordinate"
+            type: "QPointF"
+            Parameter { name: "coordinate"; type: "QGeoCoordinate" }
         }
         Method {
             name: "toScreenPosition"
@@ -287,7 +298,7 @@ Module {
     Component {
         name: "QDeclarativeGeoMapType"
         prototype: "QObject"
-        exports: ["QtLocation/MapType 5.0", "QtLocation/MapType 5.4"]
+        exports: ["QtLocation/MapType 5.0", "QtLocation/MapType 5.5"]
         isCreatable: false
         exportMetaObjectRevisions: [0, 1]
         Enum {
@@ -303,6 +314,7 @@ Module {
                 "GrayStreetMap": 7,
                 "PedestrianMap": 8,
                 "CarNavigationMap": 9,
+                "CycleMap": 10,
                 "CustomMap": 100
             }
         }
diff --git a/src/imports/positioning/plugins.qmltypes b/src/imports/positioning/plugins.qmltypes
index bda2e48f..952d6830 100644
--- a/src/imports/positioning/plugins.qmltypes
+++ b/src/imports/positioning/plugins.qmltypes
@@ -4,33 +4,10 @@ import QtQuick.tooling 1.1
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtPositioning 5.4'
+// 'qmlplugindump -nonrelocatable QtPositioning 5.5'
 
 Module {
     Component {
-        name: "GeoShapeValueType"
-        prototype: "QQmlValueType"
-        exports: ["QtPositioning/GeoShape 5.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Enum {
-            name: "ShapeType"
-            values: {
-                "UnknownType": 0,
-                "RectangleType": 1,
-                "CircleType": 2
-            }
-        }
-        Property { name: "type"; type: "ShapeType"; isReadonly: true }
-        Property { name: "isValid"; type: "bool"; isReadonly: true }
-        Property { name: "isEmpty"; type: "bool"; isReadonly: true }
-        Method {
-            name: "contains"
-            type: "bool"
-            Parameter { name: "coordinate"; type: "QGeoCoordinate" }
-        }
-    }
-    Component {
         name: "LocationSingleton"
         prototype: "QObject"
         exports: ["QtPositioning/QtPositioning 5.0"]
@@ -125,9 +102,10 @@ Module {
         exports: [
             "QtPositioning/Position 5.0",
             "QtPositioning/Position 5.3",
-            "QtPositioning/Position 5.4"
+            "QtPositioning/Position 5.4",
+            "QtPositioning/Position 5.5"
         ]
-        exportMetaObjectRevisions: [0, 1, 2]
+        exportMetaObjectRevisions: [0, 1, 2, 2]
         Property { name: "latitudeValid"; type: "bool"; isReadonly: true }
         Property { name: "longitudeValid"; type: "bool"; isReadonly: true }
         Property { name: "altitudeValid"; type: "bool"; isReadonly: true }
@@ -199,4 +177,27 @@ Module {
         Method { name: "start" }
         Method { name: "stop" }
     }
+    Component {
+        name: "QGeoShape"
+        exports: ["QtPositioning/GeoShape 5.0"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "ShapeType"
+            values: {
+                "UnknownType": 0,
+                "RectangleType": 1,
+                "CircleType": 2
+            }
+        }
+        Property { name: "type"; type: "ShapeType"; isReadonly: true }
+        Property { name: "isValid"; type: "bool"; isReadonly: true }
+        Property { name: "isEmpty"; type: "bool"; isReadonly: true }
+        Method {
+            name: "contains"
+            type: "bool"
+            Parameter { name: "coordinate"; type: "QGeoCoordinate" }
+        }
+        Method { name: "toString"; type: "string" }
+    }
 }
diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp
index 561de9b5..64d29578 100644
--- a/src/imports/positioning/positioning.cpp
+++ b/src/imports/positioning/positioning.cpp
@@ -528,6 +528,9 @@ public:
             // Introduction of 5.4 version; existing 5.3 exports become automatically available under 5.4
             minor = 4;
             qmlRegisterType<QDeclarativePosition, 2>(uri, major, minor, "Position");
+
+            minor = 5;
+            qmlRegisterType<QDeclarativePosition, 2>(uri, major, minor, "Position");
         } else {
             qDebug() << "Unsupported URI given to load positioning QML plugin: " << QLatin1String(uri);
         }