Convert QtLocation QML import to new Qt 5.0 standard

"import Qt.location 5.0" is replaced by "import QtLocation 5.0"

Change-Id: I88e33bca4da62be4ab9f5490d660c306b1f2f425
Reviewed-on: http://codereview.qt-project.org/6205
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index b53b713f..c4cfb78a 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -90,10 +90,13 @@ class QLocationDeclarativeModule: public QDeclarativeExtensionPlugin
 public:
     virtual void registerTypes(const char* uri) {
         if (QLatin1String(uri) == QLatin1String("QtMobility.location")) {
-            qWarning("QtMobility.location is not supported. Use Qt.location instead.");
+            qWarning("QtMobility.location is not supported. Use QtLocation instead.");
         } else if (QLatin1String(uri) == QLatin1String("Qt.location")) {
-            // This version numbering is not correct. It is just something to get going
-            // until the proper versioning scheme of QML plugins in Qt5 is agreed upon.
+            qWarning("Qt.location is not supported. Use QtLocation instead.");
+        } else if (QLatin1String(uri) == QLatin1String("QtLocation")) {
+
+            // @uri QtLocation 5.0
+
             qmlRegisterType<QDeclarativePosition>(uri, 5, 0, "Position");
             qmlRegisterType<QDeclarativePositionSource>(uri, 5, 0, "PositionSource");
             qmlRegisterType<QDeclarativeCoordinate>(uri, 5, 0, "Coordinate");