From 9c6030845af9b31251182ee3d91186e18d939e9a Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Mon, 24 Feb 2014 10:02:11 +0100 Subject: 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 Reviewed-by: Alex Blasche --- src/imports/positioning/positioning.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/imports/positioning') 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(uri, major, minor, "Address"); qmlRegisterType(uri, major, minor, "Location"); - // Register the 5.2 types - minor = 2; - qmlRegisterSingletonType(uri, major, minor, "QtPositioning", singleton_type_factory); - qmlRegisterValueTypeEnums(uri, major, minor, "GeoShape"); - qmlRegisterType(uri, major, minor, "Position"); - qmlRegisterType(uri, major, minor, "PositionSource"); - qmlRegisterType(uri, major, minor, "Address"); - qmlRegisterType(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(uri, major, minor, "CoordinateAnimation"); qmlRegisterType(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(uri, major, minor, "QtPositioning", singleton_type_factory); } else { qDebug() << "Unsupported URI given to load positioning QML plugin: " << QLatin1String(uri); } -- cgit v1.2.1