Introduce "QtPositioning 5.4" QML import tag

5.2 declaration is no longer needed as it is implicitly done by 5.3/5.4.
The 5.4 declaration is just a redeclaration to introduce 5.4. If a
new type is introduced or an existing type changed it can be removed in
favor of the changed type.

Change-Id: I2113751faff062feaa2f7ea5e3ab9f290e90f0c2
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

1 files changed, 6 insertions, 10 deletions

diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp
index 4314582d..1b16f82b 100644
--- a/src/imports/positioning/positioning.cpp
+++ b/src/imports/positioning/positioning.cpp
@@ -120,20 +120,16 @@ public:
             qmlRegisterType<QDeclarativeGeoAddress      >(uri, major, minor, "Address");
             qmlRegisterType<QDeclarativeGeoLocation     >(uri, major, minor, "Location");
 
-            // Register the 5.2 types
-            minor = 2;
-            qmlRegisterSingletonType<LocationSingleton  >(uri, major, minor, "QtPositioning", singleton_type_factory);
-            qmlRegisterValueTypeEnums<GeoShapeValueType >(uri, major, minor, "GeoShape");
-            qmlRegisterType<QDeclarativePosition        >(uri, major, minor, "Position");
-            qmlRegisterType<QDeclarativePositionSource  >(uri, major, minor, "PositionSource");
-            qmlRegisterType<QDeclarativeGeoAddress      >(uri, major, minor, "Address");
-            qmlRegisterType<QDeclarativeGeoLocation     >(uri, major, minor, "Location");
-
             // Register the 5.3 types
-            // Introduction of 5.3 version; existing 5.2 exports automatically become availabe under 5.3 as well
+            // Introduction of 5.3 version; existing 5.0 exports become automatically available under 5.3
             minor = 3;
             qmlRegisterType<QDeclarativeGeoCoordinateAnimation  >(uri, major, minor, "CoordinateAnimation");
             qmlRegisterType<QDeclarativePosition, 1             >(uri, major, minor, "Position");
+
+            // Register the 5.4 types
+            // Introduction of 5.4 version; iexisting 5.3 exports become automatically available under 5.4
+            minor = 4;
+            qmlRegisterSingletonType<LocationSingleton  >(uri, major, minor, "QtPositioning", singleton_type_factory);
         } else {
             qDebug() << "Unsupported URI given to load positioning QML plugin: " << QLatin1String(uri);
         }