Merge remote-tracking branch 'gerrit/5.4' into dev

Change-Id: I5ef7649f02455269a8e2caa2f2d2241503586be3

3 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp
index 7862c470..fec7ba30 100644
--- a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp
+++ b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp
@@ -412,7 +412,7 @@ bool QGeoCodeXmlParser::parseAddress(QGeoAddress *address)
         }
 
         if (inThoroughfare && (m_reader->name() == "number")) {
-            address->setStreet(m_reader->readElementText() + " " + address->street());
+            address->setStreet(m_reader->readElementText() + ' ' + address->street());
             if (!m_reader->readNextStartElement())
                 inThoroughfare = false;
         }
diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
index ce4deaef..f8c29c7b 100644
--- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
@@ -246,7 +246,7 @@ QStringList QGeoRoutingManagerEngineNokia::calculateRouteRequestString(const QGe
         baseRequest += QString::number(i);
         baseRequest += QStringLiteral("=geo!");
         baseRequest += trimDouble(request.waypoints().at(i).latitude());
-        baseRequest += ",";
+        baseRequest += ',';
         baseRequest += trimDouble(request.waypoints().at(i).longitude());
     }
 
@@ -283,7 +283,7 @@ QStringList QGeoRoutingManagerEngineNokia::updateRouteRequestString(const QGeoRo
 
     baseRequest += "&pos=";
     baseRequest += QString::number(position.latitude());
-    baseRequest += ",";
+    baseRequest += ',';
     baseRequest += QString::number(position.longitude());
 
     QGeoRouteRequest::RouteOptimizations optimization = route.request().routeOptimization();
@@ -328,7 +328,7 @@ QString QGeoRoutingManagerEngineNokia::modesRequestString(const QGeoRouteRequest
         QString weightString = "";
         switch (weight) {
             case QGeoRouteRequest::PreferFeatureWeight:
-                weightString = "1";
+                weightString = '1';
                 break;
             case QGeoRouteRequest::AvoidFeatureWeight:
                 weightString = "-1";
@@ -370,9 +370,9 @@ QString QGeoRoutingManagerEngineNokia::modesRequestString(const QGeoRouteRequest
     }
 
     requestString += "&mode=";
-    requestString += optimization + ";" + modes.join(",");
+    requestString += optimization + ';' + modes.join(',');
     if (featureStrings.count())
-        requestString += ";" + featureStrings.join(",");
+        requestString += ';' + featureStrings.join(',');
     return requestString;
 }
 
diff --git a/src/plugins/geoservices/nokia/qgeouriprovider.cpp b/src/plugins/geoservices/nokia/qgeouriprovider.cpp
index 932818a5..ceb86cf8 100644
--- a/src/plugins/geoservices/nokia/qgeouriprovider.cpp
+++ b/src/plugins/geoservices/nokia/qgeouriprovider.cpp
@@ -83,7 +83,7 @@ QString QGeoUriProvider::getCurrentHost() const
 {
     if (m_maxSubdomains) {
         QString result(m_firstSubdomain.toLatin1() + qrand() % m_maxSubdomains);
-        result += "." + m_currentHost;
+        result += '.' + m_currentHost;
         return result;
     }
     return m_currentHost;