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>

2 files changed, 2 insertions, 6 deletions

diff --git a/tests/plugins/declarativetestplugin/declarativetestplugin.pro b/tests/plugins/declarativetestplugin/declarativetestplugin.pro
index 8cf4902d..34372513 100644
--- a/tests/plugins/declarativetestplugin/declarativetestplugin.pro
+++ b/tests/plugins/declarativetestplugin/declarativetestplugin.pro
@@ -1,5 +1,5 @@
 TARGET  = declarative_location_test
-TARGETPATH = Qt/location/test
+TARGETPATH = QtLocation/test
 
 include(../../../src/imports/location/qlocationimport.pri)
 
@@ -11,10 +11,6 @@ target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 INCLUDEPATH += ../../../src/imports/location
 INCLUDEPATH += ../../../src/location
 
-# On some platforms, build both versions because debug and release
-# versions are incompatible
-#win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release
-
 HEADERS += qdeclarativepinchgenerator_p.h \
            qdeclarativelocationtestmodel_p.h \
            ../../../src/imports/location/qdeclarativecoordinate_p.h
diff --git a/tests/plugins/declarativetestplugin/locationtest.cpp b/tests/plugins/declarativetestplugin/locationtest.cpp
index caa796b4..8f4b0eeb 100644
--- a/tests/plugins/declarativetestplugin/locationtest.cpp
+++ b/tests/plugins/declarativetestplugin/locationtest.cpp
@@ -54,7 +54,7 @@ class QLocationDeclarativeTestModule: public QDeclarativeExtensionPlugin
 public:
     virtual void registerTypes(const char* uri) {
         qDebug() << "registerTypes in new test plugin: " << uri;
-        if (QLatin1String(uri) == QLatin1String("Qt.location.test")) {
+        if (QLatin1String(uri) == QLatin1String("QtLocation.test")) {
             // 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.
             qmlRegisterType<QDeclarativePinchGenerator>(uri, 5, 0, "PinchGenerator");