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

Change-Id: I5ef7649f02455269a8e2caa2f2d2241503586be3

33 files changed, 67 insertions, 70 deletions

diff --git a/src/imports/positioning/qdeclarativeposition.cpp b/src/imports/positioning/qdeclarativeposition.cpp
index 04b42cbc..ee971c01 100644
--- a/src/imports/positioning/qdeclarativeposition.cpp
+++ b/src/imports/positioning/qdeclarativeposition.cpp
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
     \section2 Example Usage
 
     See the example given for the \l{PositionSource} type, or the
-    \l{flickr}{Flickr} example application.
+    \l{geoflickr}{GeoFlickr} example application.
 
     \sa PositionSource, coordinate
 */
diff --git a/src/imports/positioning/qdeclarativepositionsource.cpp b/src/imports/positioning/qdeclarativepositionsource.cpp
index a770e664..f42518f3 100644
--- a/src/imports/positioning/qdeclarativepositionsource.cpp
+++ b/src/imports/positioning/qdeclarativepositionsource.cpp
@@ -99,7 +99,7 @@ QT_BEGIN_NAMESPACE
     }
     \endcode
 
-    The \l{flickr}{Flickr} example application shows how to use
+    The \l{geoflickr}{GeoFlickr} example application shows how to use
     a PositionSource in your application to retrieve local data for users
     from a REST web service.
 
@@ -243,7 +243,7 @@ void QDeclarativePositionSource::setNmeaSource(const QUrl &nmeaSource)
             } else if (localFileName.startsWith("qrc:/")) {
                 localFileName.remove(0, 5);
             }
-            if (!QFile::exists(localFileName) && localFileName.startsWith("/")) {
+            if (!QFile::exists(localFileName) && localFileName.startsWith('/')) {
                 localFileName.remove(0,1);
             }
         }
diff --git a/src/location/maps/qgeocodingmanager.h b/src/location/maps/qgeocodingmanager.h
index 821c755d..d40723af 100644
--- a/src/location/maps/qgeocodingmanager.h
+++ b/src/location/maps/qgeocodingmanager.h
@@ -37,9 +37,9 @@
 #include <QtLocation/QGeoCodeReply>
 #include <QtPositioning/QGeoRectangle>
 
-#include <QObject>
-#include <QList>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QList>
+#include <QtCore/QMap>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/maps/qgeomaneuver.h b/src/location/maps/qgeomaneuver.h
index 7b569cdc..cc1a4be1 100644
--- a/src/location/maps/qgeomaneuver.h
+++ b/src/location/maps/qgeomaneuver.h
@@ -34,7 +34,7 @@
 #ifndef QGEOMANEUVER_H
 #define QGEOMANEUVER_H
 
-#include <qshareddata.h>
+#include <QtCore/qshareddata.h>
 #include <QtLocation/qlocationglobal.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/location/maps/qgeoroute.h b/src/location/maps/qgeoroute.h
index 46365027..669723f9 100644
--- a/src/location/maps/qgeoroute.h
+++ b/src/location/maps/qgeoroute.h
@@ -37,9 +37,9 @@
 #include <QtPositioning/QGeoCoordinate>
 #include <QtLocation/QGeoRouteRequest>
 
-#include <QExplicitlySharedDataPointer>
-#include <QList>
-#include <QHash>
+#include <QtCore/QExplicitlySharedDataPointer>
+#include <QtCore/QList>
+#include <QtCore/QHash>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/maps/qgeoroutereply.h b/src/location/maps/qgeoroutereply.h
index 532226a7..06a74d4f 100644
--- a/src/location/maps/qgeoroutereply.h
+++ b/src/location/maps/qgeoroutereply.h
@@ -36,8 +36,8 @@
 
 #include <QtLocation/QGeoRoute>
 
-#include <QList>
-#include <QObject>
+#include <QtCore/QList>
+#include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/maps/qgeorouterequest.h b/src/location/maps/qgeorouterequest.h
index e510d5bb..bb847274 100644
--- a/src/location/maps/qgeorouterequest.h
+++ b/src/location/maps/qgeorouterequest.h
@@ -34,9 +34,9 @@
 #ifndef QGEOROUTEREQUEST_H
 #define QGEOROUTEREQUEST_H
 
-#include <QList>
-#include <QExplicitlySharedDataPointer>
-#include <QDateTime>
+#include <QtCore/QList>
+#include <QtCore/QExplicitlySharedDataPointer>
+#include <QtCore/QDateTime>
 
 #include <QtLocation/qlocationglobal.h>
 #include <QtPositioning/qgeocoordinate.h>
diff --git a/src/location/maps/qgeoroutesegment.h b/src/location/maps/qgeoroutesegment.h
index f6d29a58..ccc1c1d6 100644
--- a/src/location/maps/qgeoroutesegment.h
+++ b/src/location/maps/qgeoroutesegment.h
@@ -34,8 +34,8 @@
 #ifndef QGEOROUTESEGMENT_H
 #define QGEOROUTESEGMENT_H
 
-#include <QExplicitlySharedDataPointer>
-#include <QList>
+#include <QtCore/QExplicitlySharedDataPointer>
+#include <QtCore/QList>
 #include <QtLocation/qlocationglobal.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp
index b72aed26..d828d62c 100644
--- a/src/location/maps/qgeoserviceprovider.cpp
+++ b/src/location/maps/qgeoserviceprovider.cpp
@@ -58,7 +58,6 @@
 #include <QMetaEnum>
 #include <QProcess>
 #include <QEventLoop>
-#include <QString>
 #include <QtCore/private/qfactoryloader_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/location/maps/qgeoserviceproviderfactory.h b/src/location/maps/qgeoserviceproviderfactory.h
index 2b539fa2..bbde8904 100644
--- a/src/location/maps/qgeoserviceproviderfactory.h
+++ b/src/location/maps/qgeoserviceproviderfactory.h
@@ -36,9 +36,9 @@
 
 #include <QtLocation/QGeoServiceProvider>
 
-#include <QtPlugin>
-#include <QMap>
-#include <QString>
+#include <QtCore/QtPlugin>
+#include <QtCore/QMap>
+#include <QtCore/QString>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/places/qplaceattribute.h b/src/location/places/qplaceattribute.h
index da6a7c06..43fd2e47 100644
--- a/src/location/places/qplaceattribute.h
+++ b/src/location/places/qplaceattribute.h
@@ -34,9 +34,9 @@
 #ifndef QPLACEATTRIBUTE_H
 #define QPLACEATTRIBUTE_H
 
-#include <QString>
-#include <QVariant>
-#include <QSharedDataPointer>
+#include <QtCore/QString>
+#include <QtCore/QVariant>
+#include <QtCore/QSharedDataPointer>
 
 #include <QtLocation/qlocationglobal.h>
 
diff --git a/src/location/places/qplacecontactdetail.h b/src/location/places/qplacecontactdetail.h
index 8d96bca2..b4729398 100644
--- a/src/location/places/qplacecontactdetail.h
+++ b/src/location/places/qplacecontactdetail.h
@@ -34,9 +34,9 @@
 #ifndef QPLACECONTACTDETAIL_H
 #define QPLACECONTACTDETAIL_H
 
-#include <QString>
-#include <QVariant>
-#include <QSharedDataPointer>
+#include <QtCore/QString>
+#include <QtCore/QVariant>
+#include <QtCore/QSharedDataPointer>
 
 #include <QtLocation/qlocationglobal.h>
 
diff --git a/src/location/places/qplacecontent.h b/src/location/places/qplacecontent.h
index 3724a418..530ee02c 100644
--- a/src/location/places/qplacecontent.h
+++ b/src/location/places/qplacecontent.h
@@ -35,9 +35,9 @@
 
 #include <QtLocation/qlocationglobal.h>
 
-#include <QMap>
-#include <QMetaType>
-#include <QSharedDataPointer>
+#include <QtCore/QMap>
+#include <QtCore/QMetaType>
+#include <QtCore/QSharedDataPointer>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/places/qplacecontentrequest.h b/src/location/places/qplacecontentrequest.h
index 95cc8075..23485e0c 100644
--- a/src/location/places/qplacecontentrequest.h
+++ b/src/location/places/qplacecontentrequest.h
@@ -34,7 +34,7 @@
 #ifndef QPLACECONTENTREQUEST_H
 #define QPLACECONTENTREQUEST_H
 
-#include <QSharedDataPointer>
+#include <QtCore/QSharedDataPointer>
 
 #include <QtLocation/QPlaceContent>
 
diff --git a/src/location/places/qplaceimage.h b/src/location/places/qplaceimage.h
index f6b0758a..d7aa63d6 100644
--- a/src/location/places/qplaceimage.h
+++ b/src/location/places/qplaceimage.h
@@ -34,8 +34,8 @@
 #ifndef QPLACEIMAGE_H
 #define QPLACEIMAGE_H
 
-#include <QSharedDataPointer>
-#include <QString>
+#include <QtCore/QSharedDataPointer>
+#include <QtCore/QString>
 #include <QtLocation/QPlaceSupplier>
 #include <QtLocation/QPlaceContent>
 
diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h
index e57a286b..21daadb5 100644
--- a/src/location/places/qplacemanager.h
+++ b/src/location/places/qplacemanager.h
@@ -45,10 +45,10 @@
 #include <QtLocation/QPlaceSearchRequest>
 #include <QtLocation/QPlaceSearchResult>
 
-#include <QLocale>
-#include <QVector>
-#include <QString>
-#include <QObject>
+#include <QtCore/QLocale>
+#include <QtCore/QVector>
+#include <QtCore/QString>
+#include <QtCore/QObject>
 #include <QtLocation/QPlaceIcon>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/location/places/qplacesearchresult.h b/src/location/places/qplacesearchresult.h
index a3285d9b..92da39f7 100644
--- a/src/location/places/qplacesearchresult.h
+++ b/src/location/places/qplacesearchresult.h
@@ -34,9 +34,9 @@
 #ifndef QPLACESEARCHRESULT_H
 #define QPLACESEARCHRESULT_H
 
-#include <QSharedDataPointer>
-#include <QVariant>
-#include <QString>
+#include <QtCore/QSharedDataPointer>
+#include <QtCore/QVariant>
+#include <QtCore/QString>
 #include <QtLocation/QPlace>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/location/places/qplacesearchsuggestionreply.h b/src/location/places/qplacesearchsuggestionreply.h
index e53873c1..950ad040 100644
--- a/src/location/places/qplacesearchsuggestionreply.h
+++ b/src/location/places/qplacesearchsuggestionreply.h
@@ -36,7 +36,7 @@
 
 #include <QtLocation/QPlaceReply>
 
-#include <QStringList>
+#include <QtCore/QStringList>
 
 QT_BEGIN_NAMESPACE
 
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;
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 099f7995..35b462d4 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 qtHaveModule(positioning): SUBDIRS +=  position
-qtHaveModule(location) SUBDIRS += geoservices
+qtHaveModule(location): SUBDIRS += geoservices
diff --git a/src/positioning/doc/images/qml-flickr-1.jpg b/src/positioning/doc/images/qml-flickr-1.jpg
index 14fc5c92..42514ff0 100644
--- a/src/positioning/doc/images/qml-flickr-1.jpg
+++ b/src/positioning/doc/images/qml-flickr-1.jpg
diff --git a/src/positioning/doc/src/examples/declarative-flickr.qdoc b/src/positioning/doc/src/examples/geoflickr.qdoc
index a1d0bb58..af47461b 100644
--- a/src/positioning/doc/src/examples/declarative-flickr.qdoc
+++ b/src/positioning/doc/src/examples/geoflickr.qdoc
@@ -26,11 +26,11 @@
 ****************************************************************************/
 
 /*!
-    \example flickr
-    \title Flickr (QML)
+    \example geoflickr
+    \title GeoFlickr (QML)
     \ingroup qtpositioning-examples
 
-    \brief The Flickr example shows how to use the user's current position to
+    \brief The GeoFlickr example shows how to use the user's current position to
            fetch local content from a web service.
 
     This is a small example, illustrating one of the very core parts of the
@@ -54,20 +54,20 @@
     GeoTab component (the floating "window" describing current position and
     status).
 
-    \snippet flickr/flickrmobile/GeoTab.qml possrc
+    \snippet geoflickr/flickrmobile/GeoTab.qml possrc
 
     When the "Locate and update" button is pressed, we first interrogate the
     PositionSource to check if it has an available backend for positioning
     data. If it does not, we fall back to using a pre-recorded NMEA log
     for demonstration. We then instruct the PositionSource to update.
 
-    \snippet flickr/flickrmobile/GeoTab.qml locatebutton-top
-    \snippet flickr/flickrmobile/GeoTab.qml locatebutton-clicked
+    \snippet geoflickr/flickrmobile/GeoTab.qml locatebutton-top
+    \snippet geoflickr/flickrmobile/GeoTab.qml locatebutton-clicked
 
     To share the new position data with the rest of the application, we use
     properties that we have created on the GeoTab component:
 
-    \snippet flickr/flickrmobile/GeoTab.qml props
+    \snippet geoflickr/flickrmobile/GeoTab.qml props
 
     \section1 Using the Current Position
 
@@ -79,7 +79,7 @@
     In this case, it retrieves data from the Flickr REST API online, based on
     our current position
 
-    \snippet flickr/flickrcommon/RestModel.qml restmodel
+    \snippet geoflickr/flickrcommon/RestModel.qml restmodel
 
     This model data is then shown in a variety of Qt Quick views to produce
     the example application.
diff --git a/src/positioning/doc/src/qml-position.qdoc b/src/positioning/doc/src/qml-position.qdoc
index 3ccac326..ec1cf47a 100644
--- a/src/positioning/doc/src/qml-position.qdoc
+++ b/src/positioning/doc/src/qml-position.qdoc
@@ -111,9 +111,9 @@ PositionSource {
 
 
 
-\section2 \b{Flickr Example}
+\section2 \b{GeoFlickr Example}
 
-The \l{Flickr (QML)}{Flickr Example} uses the Location to download thumbnail
+The \l{GeoFlickr (QML)}{GeoFlickr Example} uses the Location to download thumbnail
 images from Flickr relevant to the current location.
 
 */
diff --git a/src/positioning/doc/src/qtpositioning.qdoc b/src/positioning/doc/src/qtpositioning.qdoc
index ae74f89c..5662b0aa 100644
--- a/src/positioning/doc/src/qtpositioning.qdoc
+++ b/src/positioning/doc/src/qtpositioning.qdoc
@@ -114,7 +114,7 @@ such as speed and direction. This provides the fundamental location information
 \section2 Examples
 
 \list
-    \li \l {Flickr (QML)}
+    \li \l {GeoFlickr (QML)}
     \li \l {Log File Position Source (C++)}
     \li \l {SatelliteInfo (C++/QML)}
     \li \l {Weather Info (C++/QML)}
diff --git a/src/positioning/qgeoareamonitorsource.h b/src/positioning/qgeoareamonitorsource.h
index 642bb4e7..88d01dc8 100644
--- a/src/positioning/qgeoareamonitorsource.h
+++ b/src/positioning/qgeoareamonitorsource.h
@@ -37,8 +37,8 @@
 #include <QtPositioning/QGeoAreaMonitorInfo>
 #include <QtPositioning/QGeoPositionInfoSource>
 
-#include <QObject>
-#include <QStringList>
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/positioning/qgeocoordinate.cpp b/src/positioning/qgeocoordinate.cpp
index 3ec69744..b604e8b4 100644
--- a/src/positioning/qgeocoordinate.cpp
+++ b/src/positioning/qgeocoordinate.cpp
@@ -42,8 +42,6 @@
 
 #include <math.h>
 
-#include <QDebug>
-
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
 #endif
diff --git a/src/positioning/qgeocoordinate.h b/src/positioning/qgeocoordinate.h
index d80e0187..701ba50e 100644
--- a/src/positioning/qgeocoordinate.h
+++ b/src/positioning/qgeocoordinate.h
@@ -36,7 +36,7 @@
 
 #include <QtCore/QMetaType>
 #include <QtCore/QString>
-#include <QSharedDataPointer>
+#include <QtCore/QSharedDataPointer>
 #include <QtPositioning/qpositioningglobal.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/positioning/qgeopositioninfo.h b/src/positioning/qgeopositioninfo.h
index 865f5bdf..8debb806 100644
--- a/src/positioning/qgeopositioninfo.h
+++ b/src/positioning/qgeopositioninfo.h
@@ -35,7 +35,7 @@
 
 #include <QtPositioning/QGeoCoordinate>
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/positioning/qgeopositioninfosource.h b/src/positioning/qgeopositioninfosource.h
index f76161cc..e71b766d 100644
--- a/src/positioning/qgeopositioninfosource.h
+++ b/src/positioning/qgeopositioninfosource.h
@@ -35,7 +35,7 @@
 
 #include <QtPositioning/QGeoPositionInfo>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/positioning/qgeopositioninfosourcefactory.h b/src/positioning/qgeopositioninfosourcefactory.h
index 776cd1f3..4db92fe6 100644
--- a/src/positioning/qgeopositioninfosourcefactory.h
+++ b/src/positioning/qgeopositioninfosourcefactory.h
@@ -37,7 +37,7 @@
 #include <QtPositioning/QGeoPositionInfoSource>
 #include <QtPositioning/QGeoSatelliteInfoSource>
 #include <QtPositioning/QGeoAreaMonitorSource>
-#include <QList>
+#include <QtCore/QList>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/positioning/qgeosatelliteinfosource.h b/src/positioning/qgeosatelliteinfosource.h
index 7dfd70b6..bd21db4f 100644
--- a/src/positioning/qgeosatelliteinfosource.h
+++ b/src/positioning/qgeosatelliteinfosource.h
@@ -35,8 +35,8 @@
 
 #include <QtPositioning/QGeoSatelliteInfo>
 
-#include <QObject>
-#include <QList>
+#include <QtCore/QObject>
+#include <QtCore/QList>
 
 QT_BEGIN_NAMESPACE