Add proper version to QtPositioning and its QML API.

The QML API remains available under 5.0 though.

Change-Id: I037b82e5b12825db610e8458d6c82122ecde4f44
Reviewed-by: Erik Mattsson <erik.mattsson@appello.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

8 files changed, 35 insertions, 22 deletions

diff --git a/src/imports/positioning/locationsingleton.cpp b/src/imports/positioning/locationsingleton.cpp
index b5c407b5..5fb96f49 100644
--- a/src/imports/positioning/locationsingleton.cpp
+++ b/src/imports/positioning/locationsingleton.cpp
@@ -45,12 +45,13 @@
     \qmltype QtPositioning
     \instantiates LocationSingleton
     \inqmlmodule QtPositioning
+    \since 5.2
 
     \brief The QtPositioning global object provides useful functions for working with location-based
            types in QML.
 
     \qml
-    import QtPositioning 5.0
+    import QtPositioning 5.2
 
     Item {
         property variant coordinate: QtPositioning.coordinate(-27.5, 153.1)
diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp
index 031b06b2..0804a8ce 100644
--- a/src/imports/positioning/positioning.cpp
+++ b/src/imports/positioning/positioning.cpp
@@ -92,26 +92,38 @@ class QLocationDeclarativeModule: public QQmlExtensionPlugin
 public:
     virtual void registerTypes(const char *uri)
     {
-        if (QLatin1String(uri) == QLatin1String("QtPositioning")) {
+        if (QLatin1String(uri) == QStringLiteral("QtPositioning")) {
 
             // @uri QtPositioning 5.0
 
-            qmlRegisterSingletonType<LocationSingleton>(uri, 5, 0, "QtPositioning", singleton_type_factory);
-
-            QQml_addValueTypeProvider(getValueTypeProvider());
-            qmlRegisterValueTypeEnums<GeoShapeValueType>(uri, 5, 0, "GeoShape");
-
-            qmlRegisterType<QDeclarativePosition>(uri, 5, 0, "Position");
-            qmlRegisterType<QDeclarativePositionSource>(uri, 5, 0, "PositionSource");
-            qmlRegisterType<QDeclarativeGeoAddress>(uri, 5, 0, "Address");
-
-            qmlRegisterType<QDeclarativeGeoLocation>(uri, 5, 0, "Location");
+            int major = 5;
+            int minor = 0;
 
             qRegisterMetaType<QGeoCoordinate>("QGeoCoordinate");
             qRegisterMetaType<QGeoAddress>("QGeoAddress");
             qRegisterMetaType<QGeoRectangle>("QGeoRectangle");
             qRegisterMetaType<QGeoCircle>("QGeoCircle");
             qRegisterMetaType<QGeoLocation>("QGeoLocation");
+
+            QQml_addValueTypeProvider(getValueTypeProvider());
+
+            // Register the 5.0 types
+            // 5.0 is silent and not advertised
+            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.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");
         } else {
             qDebug() << "Unsupported URI given to load positioning QML plugin: " << QLatin1String(uri);
         }
diff --git a/src/imports/positioning/qdeclarativecoordinate.cpp b/src/imports/positioning/qdeclarativecoordinate.cpp
index ca909d9f..5d876a43 100644
--- a/src/imports/positioning/qdeclarativecoordinate.cpp
+++ b/src/imports/positioning/qdeclarativecoordinate.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
     \qmlbasictype coordinate
     \inqmlmodule QtPositioning
     \ingroup qml-QtPositioning5-basictypes
-    \since Qt Positioning 5.0
+    \since 5.2
 
     \brief The coordinate type represents and stores a geographic position.
 
@@ -88,7 +88,7 @@ QT_BEGIN_NAMESPACE
     function:
 
     \qml
-    import QtPositioning 5.0
+    import QtPositioning 5.2
 
     Location { coordinate: QtPositioning.coordinate(-27.5, 153.1) }
     \endqml
diff --git a/src/imports/positioning/qdeclarativegeocircle.cpp b/src/imports/positioning/qdeclarativegeocircle.cpp
index 69e10ac7..65448d57 100644
--- a/src/imports/positioning/qdeclarativegeocircle.cpp
+++ b/src/imports/positioning/qdeclarativegeocircle.cpp
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
     \qmlbasictype geocircle
     \inqmlmodule QtPositioning
     \ingroup qml-QtPositioning5-basictypes
-    \since Qt Positioning 5.0
+    \since 5.2
 
     \brief The geocircle type represents a circular geographic area.
 
@@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE
     use the \l {QtPositioning::circle}{QtPositioning.circle()} function:
 
     \qml
-    import QtPositioning 5.0
+    import QtPositioning 5.2
 
     Item {
         property variant region: QtPositioning.circle(QtPositioning.coordinate(-27.5, 153.1), 1000)
diff --git a/src/imports/positioning/qdeclarativegeorectangle.cpp b/src/imports/positioning/qdeclarativegeorectangle.cpp
index 5dc19bbc..cf860fe0 100644
--- a/src/imports/positioning/qdeclarativegeorectangle.cpp
+++ b/src/imports/positioning/qdeclarativegeorectangle.cpp
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
     \qmlbasictype georectangle
     \inqmlmodule QtPositioning
     \ingroup qml-QtPositioning5-basictypes
-    \since Qt Positioning 5.0
+    \since 5.2
 
     \brief The georectangle type represents a rectangular geographic area.
 
@@ -86,7 +86,7 @@ QT_BEGIN_NAMESPACE
     value, use the \l {QtPositioning::rectangle}{QtPositioning.rectangle()} function:
 
     \qml
-    import QtPositioning 5.0
+    import QtPositioning 5.2
 
     Item {
         property variant region: QtPositioning.rectangle(QtPositioning.coordinate(-27.5, 153.1), QtPositioning.coordinate(-27.6, 153.2))
diff --git a/src/imports/positioning/qdeclarativegeoshape.cpp b/src/imports/positioning/qdeclarativegeoshape.cpp
index 5c2cf080..4c4d32cc 100644
--- a/src/imports/positioning/qdeclarativegeoshape.cpp
+++ b/src/imports/positioning/qdeclarativegeoshape.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
     \qmlbasictype geoshape
     \inqmlmodule QtPositioning
     \ingroup qml-QtPositioning5-basictypes
-    \since Qt Positioning 5.0
+    \since 5.2
 
     \brief A geoshape type represents an abstract geographic area.
 
@@ -85,7 +85,7 @@ QT_BEGIN_NAMESPACE
     or with the \l {QtPositioning::shape}{QtPositioning.shape()} function:
 
     \qml
-    import QtPositioning 5.0
+    import QtPositioning 5.2
 
     Item {
         property variant region: QtPositioning.shape()
diff --git a/src/imports/positioning/qdeclarativeposition.cpp b/src/imports/positioning/qdeclarativeposition.cpp
index 8be01086..51456e02 100644
--- a/src/imports/positioning/qdeclarativeposition.cpp
+++ b/src/imports/positioning/qdeclarativeposition.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
     \qmltype Position
     \instantiates QDeclarativePosition
     \inqmlmodule QtPositioning
-    \since Qt Positioning 5.0
+    \since 5.2
 
     \brief The Position type holds positional data at a particular point in time,
     such as coordinate (longitude, latitude, altitude) and speed.
diff --git a/src/imports/positioning/qdeclarativepositionsource.cpp b/src/imports/positioning/qdeclarativepositionsource.cpp
index 694e0e8f..9f19b1e3 100644
--- a/src/imports/positioning/qdeclarativepositionsource.cpp
+++ b/src/imports/positioning/qdeclarativepositionsource.cpp
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
     \qmltype PositionSource
     \instantiates QDeclarativePositionSource
     \inqmlmodule QtPositioning
-    \since Qt Positioning 5.0
+    \since 5.2
 
     \brief The PositionSource type provides the device's current position.