Add "here" prefix to all Here geoservices parameters

Task-number: QTBUG-42151
Change-Id: I3d71ee77327478dfdda23af709bee489f83bb9f6
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

5 files changed, 11 insertions, 11 deletions

diff --git a/tests/auto/declarative_ui/tst_map.qml b/tests/auto/declarative_ui/tst_map.qml
index 6717bc2a..7b485256 100644
--- a/tests/auto/declarative_ui/tst_map.qml
+++ b/tests/auto/declarative_ui/tst_map.qml
@@ -45,11 +45,11 @@ Item {
     Plugin { id: herePlugin; name: "here";
         parameters: [
                        PluginParameter {
-                           name: "app_id"
+                           name: "here.app_id"
                            value: "stub"
                        },
                        PluginParameter {
-                           name: "token"
+                           name: "here.token"
                            value: "stub"
                        }
                    ]
diff --git a/tests/auto/declarative_ui/tst_map_maptype.qml b/tests/auto/declarative_ui/tst_map_maptype.qml
index 2f015552..26290399 100644
--- a/tests/auto/declarative_ui/tst_map_maptype.qml
+++ b/tests/auto/declarative_ui/tst_map_maptype.qml
@@ -45,11 +45,11 @@ TestCase {
         name: "here"
         parameters: [
                        PluginParameter {
-                           name: "app_id"
+                           name: "here.app_id"
                            value: "stub"
                        },
                        PluginParameter {
-                           name: "token"
+                           name: "here.token"
                            value: "stub"
                        }
                    ]
diff --git a/tests/auto/nokia_services/places_semiauto/tst_places.cpp b/tests/auto/nokia_services/places_semiauto/tst_places.cpp
index 9fe564b5..75f3f4ef 100644
--- a/tests/auto/nokia_services/places_semiauto/tst_places.cpp
+++ b/tests/auto/nokia_services/places_semiauto/tst_places.cpp
@@ -116,11 +116,11 @@ void tst_QPlaceManagerNokia::initTestCase()
     if (!(env.contains(AppIdEnv) && env.contains(TokenEnv)))
         QSKIP("NOKIA_APPID and NOKIA_TOKEN environment variables not set");\
 
-    params.insert(QStringLiteral("app_id"), env.value(AppIdEnv));
-    params.insert(QStringLiteral("token"), env.value(TokenEnv));
+    params.insert(QStringLiteral("here.app_id"), env.value(AppIdEnv));
+    params.insert(QStringLiteral("here.token"), env.value(TokenEnv));
 
     if (env.contains(ProxyEnv))
-        params.insert(QStringLiteral("proxy"), env.value(ProxyEnv));
+        params.insert(QStringLiteral("here.proxy"), env.value(ProxyEnv));
 #else
     QSKIP("Cannot parse process environment, NOKIA_APPID and NOKIA_TOKEN not set");
 #endif
diff --git a/tests/auto/nokia_services/routing/tst_routing.cpp b/tests/auto/nokia_services/routing/tst_routing.cpp
index 53deb55d..21ab95ad 100644
--- a/tests/auto/nokia_services/routing/tst_routing.cpp
+++ b/tests/auto/nokia_services/routing/tst_routing.cpp
@@ -329,8 +329,8 @@ void tst_nokia_routing::initTestCase()
 
     QVariantMap parameters;
     parameters.insert(QStringLiteral("nam"), QVariant::fromValue<void*>(m_networkManager));
-    parameters.insert(QStringLiteral("app_id"), "stub");
-    parameters.insert(QStringLiteral("token"), "stub");
+    parameters.insert(QStringLiteral("here.app_id"), "stub");
+    parameters.insert(QStringLiteral("here.token"), "stub");
 
     m_geoServiceProvider = new QGeoServiceProvider(QStringLiteral("here"), parameters);
     QVERIFY(m_geoServiceProvider);
diff --git a/tests/auto/qplacemanager_nokia/tst_qplacemanager_nokia.cpp b/tests/auto/qplacemanager_nokia/tst_qplacemanager_nokia.cpp
index b761d430..eb118326 100644
--- a/tests/auto/qplacemanager_nokia/tst_qplacemanager_nokia.cpp
+++ b/tests/auto/qplacemanager_nokia/tst_qplacemanager_nokia.cpp
@@ -84,8 +84,8 @@ void tst_QPlaceManagerNokia::initTestCase()
     QStringList providers = QGeoServiceProvider::availableServiceProviders();
 
     QVariantMap params;
-    params.insert("app_id", "stub");
-    params.insert("token", "stub");
+    params.insert(QStringLiteral("here.app_id"), "stub");
+    params.insert(QStringLiteral("here.token"), "stub");
     provider = new QGeoServiceProvider("here", params);
     placeManager = provider->placeManager();
     QVERIFY(placeManager);