Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I18bb1c341e7d87cd1d649f2c3fc9c50141c6a1a9

51 files changed, 93 insertions, 79 deletions

diff --git a/src/location/doc/images/example-mapviewer.png b/examples/location/mapviewer/doc/images/mapviewer.png
index 4dc13f72..4dc13f72 100644
--- a/src/location/doc/images/example-mapviewer.png
+++ b/examples/location/mapviewer/doc/images/mapviewer.png
diff --git a/src/location/doc/src/examples/declarative-mapviewer.qdoc b/examples/location/mapviewer/doc/src/mapviewer.qdoc
index 8ba48112..e0c320c8 100644
--- a/src/location/doc/src/examples/declarative-mapviewer.qdoc
+++ b/examples/location/mapviewer/doc/src/mapviewer.qdoc
@@ -33,7 +33,7 @@
     \brief The Map Viewer example shows how to display and interact with a map,
            search for an address, and find driving directions.
 
-    \image example-mapviewer.png
+    \image mapviewer.png
 
     This is a large example covering many basic uses of maps, positioning, and
     navigation services in Qt Location. This page is divided into sections
diff --git a/src/location/doc/images/example-places.png b/examples/location/places/doc/images/places.png
index 0b1ac8b7..0b1ac8b7 100644
--- a/src/location/doc/images/example-places.png
+++ b/examples/location/places/doc/images/places.png
diff --git a/src/location/doc/src/examples/declarative-places.qdoc b/examples/location/places/doc/src/places.qdoc
index 414ccfca..bc93bcaf 100644
--- a/src/location/doc/src/examples/declarative-places.qdoc
+++ b/examples/location/places/doc/src/places.qdoc
@@ -33,7 +33,7 @@
     \brief The Places example demonstrates how to search for Places and access
            related content.
 
-    \image example-places.png
+    \image places.png
 
     The Places example demonstrates how to search for Places. In particular it shows
     how further information such as reviews, images and related content can be retrieved.
diff --git a/src/location/doc/images/places-list.png b/examples/location/places_list/doc/images/places_list.png
index bf09a031..bf09a031 100644
--- a/src/location/doc/images/places-list.png
+++ b/examples/location/places_list/doc/images/places_list.png
diff --git a/src/location/doc/src/examples/places-list.qdoc b/examples/location/places_list/doc/src/places_list.qdoc
index 7ef02b99..ee9925a1 100644
--- a/src/location/doc/src/examples/places-list.qdoc
+++ b/examples/location/places_list/doc/src/places_list.qdoc
@@ -31,7 +31,7 @@
     \ingroup qtlocation-examples
 
     \brief The Places List example demonstrates how to search for and display a list of places using a \l ListView.
-    \image places-list.png
+    \image places_list.png
 
     \include examples-run.qdocinc
 
diff --git a/src/location/doc/images/places-map.png b/examples/location/places_map/doc/images/places_map.png
index 4982df23..4982df23 100644
--- a/src/location/doc/images/places-map.png
+++ b/examples/location/places_map/doc/images/places_map.png
diff --git a/src/location/doc/src/examples/places-map.qdoc b/examples/location/places_map/doc/src/places_map.qdoc
index 6e58bfb8..61a4be17 100644
--- a/src/location/doc/src/examples/places-map.qdoc
+++ b/examples/location/places_map/doc/src/places_map.qdoc
@@ -32,7 +32,7 @@
 
     \brief The Places Map example demonstrates how to search for and display a list of places
            on a map using a MapItemView
-    \image places-map.png
+    \image places_map.png
 
     The example displays a map of the current location or, if no position is
     available, it uses Brisbane/Australia. Subsequently a search for places
diff --git a/examples/location/planespotter/doc/images/planespotter.png b/examples/location/planespotter/doc/images/planespotter.png
new file mode 100644
index 00000000..dcfd55fe
--- /dev/null
+++ b/examples/location/planespotter/doc/images/planespotter.png
diff --git a/src/location/doc/src/examples/planespotter.qdoc b/examples/location/planespotter/doc/src/planespotter.qdoc
index a07eb96a..ed3a2b21 100644
--- a/src/location/doc/src/examples/planespotter.qdoc
+++ b/examples/location/planespotter/doc/src/planespotter.qdoc
@@ -33,7 +33,7 @@
     \brief The \c {Plane Spotter} example demonstrates the tight integration of
     location and positioning data types into QML
 
-    \image planespotter.jpg
+    \image planespotter.png
 
     The \c {Plane Spotter} example demonstrates how to integrate location and positioning
     related C++ data types into QML and vice versa. This is useful when it is desirable to
diff --git a/src/positioning/doc/images/qml-flickr-1.jpg b/examples/positioning/geoflickr/doc/images/qml-flickr-1.jpg
index 42514ff0..42514ff0 100644
--- a/src/positioning/doc/images/qml-flickr-1.jpg
+++ b/examples/positioning/geoflickr/doc/images/qml-flickr-1.jpg
diff --git a/src/positioning/doc/src/examples/geoflickr.qdoc b/examples/positioning/geoflickr/doc/src/geoflickr.qdoc
index 6d043d4d..6d043d4d 100644
--- a/src/positioning/doc/src/examples/geoflickr.qdoc
+++ b/examples/positioning/geoflickr/doc/src/geoflickr.qdoc
diff --git a/src/positioning/doc/src/examples/logfilepositionsource.qdoc b/examples/positioning/logfilepositionsource/doc/src/logfilepositionsource.qdoc
index 6b008af6..6b008af6 100644
--- a/src/positioning/doc/src/examples/logfilepositionsource.qdoc
+++ b/examples/positioning/logfilepositionsource/doc/src/logfilepositionsource.qdoc
diff --git a/src/positioning/doc/images/example-satelliteinfo.png b/examples/positioning/satelliteinfo/doc/images/example-satelliteinfo.png
index aa9a217c..aa9a217c 100644
--- a/src/positioning/doc/images/example-satelliteinfo.png
+++ b/examples/positioning/satelliteinfo/doc/images/example-satelliteinfo.png
diff --git a/src/positioning/doc/src/examples/satelliteinfo.qdoc b/examples/positioning/satelliteinfo/doc/src/satelliteinfo.qdoc
index 51e40867..51e40867 100644
--- a/src/positioning/doc/src/examples/satelliteinfo.qdoc
+++ b/examples/positioning/satelliteinfo/doc/src/satelliteinfo.qdoc
diff --git a/src/positioning/doc/images/example-weatherinfo.png b/examples/positioning/weatherinfo/doc/images/example-weatherinfo.png
index 6557b57b..6557b57b 100644
--- a/src/positioning/doc/images/example-weatherinfo.png
+++ b/examples/positioning/weatherinfo/doc/images/example-weatherinfo.png
diff --git a/src/positioning/doc/src/examples/weatherinfo.qdoc b/examples/positioning/weatherinfo/doc/src/weatherinfo.qdoc
index 3db6fcbf..3db6fcbf 100644
--- a/src/positioning/doc/src/examples/weatherinfo.qdoc
+++ b/examples/positioning/weatherinfo/doc/src/weatherinfo.qdoc
diff --git a/src/imports/location/qquickgeomapgesturearea.cpp b/src/imports/location/qquickgeomapgesturearea.cpp
index f324d10e..629c9658 100644
--- a/src/imports/location/qquickgeomapgesturearea.cpp
+++ b/src/imports/location/qquickgeomapgesturearea.cpp
@@ -393,9 +393,9 @@ void QQuickGeoMapGestureArea::setAcceptedGestures(AcceptedGestures acceptedGestu
         return;
     m_acceptedGestures = acceptedGestures;
 
-    setPanEnabled(acceptedGestures & GeoMapGesture::PanGesture);
-    setFlickEnabled(acceptedGestures & GeoMapGesture::FlickGesture);
-    setPinchEnabled(acceptedGestures & GeoMapGesture::PinchGesture);
+    setPanEnabled(acceptedGestures & PanGesture);
+    setFlickEnabled(acceptedGestures & FlickGesture);
+    setPinchEnabled(acceptedGestures & PinchGesture);
 
     emit acceptedGesturesChanged();
 }
@@ -434,9 +434,9 @@ void QQuickGeoMapGestureArea::setEnabled(bool enabled)
     m_enabled = enabled;
 
     if (enabled) {
-        setPanEnabled(m_acceptedGestures & GeoMapGesture::PanGesture);
-        setFlickEnabled(m_acceptedGestures & GeoMapGesture::FlickGesture);
-        setPinchEnabled(m_acceptedGestures & GeoMapGesture::PinchGesture);
+        setPanEnabled(m_acceptedGestures & PanGesture);
+        setFlickEnabled(m_acceptedGestures & FlickGesture);
+        setPinchEnabled(m_acceptedGestures & PinchGesture);
     } else {
         setPanEnabled(false);
         setFlickEnabled(false);
diff --git a/src/location/doc/images/places-map.jpg b/src/location/doc/images/places-map.jpg
deleted file mode 100644
index b5f2e35b..00000000
--- a/src/location/doc/images/places-map.jpg
+++ /dev/null
diff --git a/src/location/doc/images/planespotter.jpg b/src/location/doc/images/planespotter.jpg
deleted file mode 100644
index d65a0328..00000000
--- a/src/location/doc/images/planespotter.jpg
+++ /dev/null
diff --git a/src/location/doc/src/examples/example-parameters.qdocinc b/src/location/doc/src/example-parameters.qdocinc
index 2ae351ba..2ae351ba 100644
--- a/src/location/doc/src/examples/example-parameters.qdocinc
+++ b/src/location/doc/src/example-parameters.qdocinc
diff --git a/src/location/doc/src/places.qdoc b/src/location/doc/src/places.qdoc
index 291af614..72e31c9c 100644
--- a/src/location/doc/src/places.qdoc
+++ b/src/location/doc/src/places.qdoc
@@ -125,7 +125,7 @@
             \li
                 \snippet places_list/places_list.qml Places ListView
             \li
-                \inlineimage places-list.png
+                \inlineimage places_list.png
     \endtable
 
     \note For simplicty's sake we have assumed that every search result is of
@@ -155,7 +155,7 @@
             \li
                 \snippet places_map/places_map.qml Places MapItemView
             \li
-                \inlineimage places-map.png
+                \inlineimage places_map.png
     \endtable
 
     \note For simplicty's sake we have assumed that every search result is of
diff --git a/src/location/doc/src/examples/qtlocation-examples.qdoc b/src/location/doc/src/qtlocation-examples.qdoc
index ce4047cb..6155a6fd 100644
--- a/src/location/doc/src/examples/qtlocation-examples.qdoc
+++ b/src/location/doc/src/qtlocation-examples.qdoc
@@ -32,7 +32,14 @@
     \ingroup all-examples
     \ingroup qtlocation
 
-    These are the Qt Location examples.
+    These examples show a range of different uses for \l{Qt Location},
+    such as displaying a map within a QML user interface, implementing basic routing and
+    place search, as well as integrating positioning data types.
+
+    These examples can work with any of the available geo services plugins. However, some plugins may
+    require additional \l {QtLocation::PluginParameter}{plugin parameters} in order to function correctly.
+    The default plugin used by these examples is \l {Qt Location Open Street Map Plugin}, which does not
+    require any parameters.
 
 */
 
diff --git a/src/location/maps/qgeocodereply.h b/src/location/maps/qgeocodereply.h
index f713e421..048493b4 100644
--- a/src/location/maps/qgeocodereply.h
+++ b/src/location/maps/qgeocodereply.h
@@ -63,7 +63,7 @@ public:
         UnknownError
     };
 
-    QGeoCodeReply(Error error, const QString &errorString, QObject *parent = 0);
+    explicit QGeoCodeReply(Error error, const QString &errorString, QObject *parent = Q_NULLPTR);
     virtual ~QGeoCodeReply();
 
     bool isFinished() const;
@@ -83,7 +83,7 @@ Q_SIGNALS:
     void error(QGeoCodeReply::Error error, const QString &errorString = QString());
 
 protected:
-    QGeoCodeReply(QObject *parent = 0);
+    explicit QGeoCodeReply(QObject *parent = Q_NULLPTR);
 
     void setError(Error error, const QString &errorString);
     void setFinished(bool finished);
diff --git a/src/location/maps/qgeocodingmanager.h b/src/location/maps/qgeocodingmanager.h
index b33cda75..eb366f68 100644
--- a/src/location/maps/qgeocodingmanager.h
+++ b/src/location/maps/qgeocodingmanager.h
@@ -78,7 +78,7 @@ Q_SIGNALS:
     void error(QGeoCodeReply *reply, QGeoCodeReply::Error error, QString errorString = QString());
 
 private:
-    QGeoCodingManager(QGeoCodingManagerEngine *engine, QObject *parent = 0);
+    explicit QGeoCodingManager(QGeoCodingManagerEngine *engine, QObject *parent = Q_NULLPTR);
 
     QGeoCodingManagerPrivate *d_ptr;
     Q_DISABLE_COPY(QGeoCodingManager)
diff --git a/src/location/maps/qgeocodingmanagerengine.h b/src/location/maps/qgeocodingmanagerengine.h
index 3e915758..ce7021a0 100644
--- a/src/location/maps/qgeocodingmanagerengine.h
+++ b/src/location/maps/qgeocodingmanagerengine.h
@@ -51,7 +51,7 @@ class Q_LOCATION_EXPORT QGeoCodingManagerEngine : public QObject
 {
     Q_OBJECT
 public:
-    QGeoCodingManagerEngine(const QVariantMap &parameters, QObject *parent = 0);
+    explicit QGeoCodingManagerEngine(const QVariantMap &parameters, QObject *parent = Q_NULLPTR);
     virtual ~QGeoCodingManagerEngine();
 
     QString managerName() const;
diff --git a/src/location/maps/qgeoroutereply.h b/src/location/maps/qgeoroutereply.h
index 52f9133d..318d85f8 100644
--- a/src/location/maps/qgeoroutereply.h
+++ b/src/location/maps/qgeoroutereply.h
@@ -60,7 +60,7 @@ public:
         UnknownError
     };
 
-    QGeoRouteReply(Error error, const QString &errorString, QObject *parent = 0);
+    explicit QGeoRouteReply(Error error, const QString &errorString, QObject *parent = Q_NULLPTR);
     virtual ~QGeoRouteReply();
 
     bool isFinished() const;
@@ -77,7 +77,7 @@ Q_SIGNALS:
     void error(QGeoRouteReply::Error error, const QString &errorString = QString());
 
 protected:
-    QGeoRouteReply(const QGeoRouteRequest &request, QObject *parent = 0);
+    explicit QGeoRouteReply(const QGeoRouteRequest &request, QObject *parent = Q_NULLPTR);
 
     void setError(Error error, const QString &errorString);
     void setFinished(bool finished);
diff --git a/src/location/maps/qgeoroutingmanager.h b/src/location/maps/qgeoroutingmanager.h
index 0648a15b..56cd8e51 100644
--- a/src/location/maps/qgeoroutingmanager.h
+++ b/src/location/maps/qgeoroutingmanager.h
@@ -77,7 +77,7 @@ Q_SIGNALS:
     void error(QGeoRouteReply *reply, QGeoRouteReply::Error error, QString errorString = QString());
 
 private:
-    QGeoRoutingManager(QGeoRoutingManagerEngine *engine, QObject *parent = 0);
+    explicit QGeoRoutingManager(QGeoRoutingManagerEngine *engine, QObject *parent = Q_NULLPTR);
 
     QGeoRoutingManagerPrivate *d_ptr;
     Q_DISABLE_COPY(QGeoRoutingManager)
diff --git a/src/location/maps/qgeoroutingmanagerengine.h b/src/location/maps/qgeoroutingmanagerengine.h
index 9fa02727..21aef7ce 100644
--- a/src/location/maps/qgeoroutingmanagerengine.h
+++ b/src/location/maps/qgeoroutingmanagerengine.h
@@ -51,7 +51,7 @@ class Q_LOCATION_EXPORT QGeoRoutingManagerEngine : public QObject
 {
     Q_OBJECT
 public:
-    QGeoRoutingManagerEngine(const QVariantMap &parameters, QObject *parent = 0);
+    explicit QGeoRoutingManagerEngine(const QVariantMap &parameters, QObject *parent = Q_NULLPTR);
     virtual ~QGeoRoutingManagerEngine();
 
     QString managerName() const;
diff --git a/src/location/places/qplacecontentreply.h b/src/location/places/qplacecontentreply.h
index 1d824485..fa96a0e2 100644
--- a/src/location/places/qplacecontentreply.h
+++ b/src/location/places/qplacecontentreply.h
@@ -49,7 +49,7 @@ class Q_LOCATION_EXPORT QPlaceContentReply : public QPlaceReply
     Q_OBJECT
 
 public:
-    explicit QPlaceContentReply(QObject *parent = 0);
+    explicit QPlaceContentReply(QObject *parent = Q_NULLPTR);
     virtual ~QPlaceContentReply();
 
     QPlaceReply::Type type() const;
diff --git a/src/location/places/qplacedetailsreply.h b/src/location/places/qplacedetailsreply.h
index c9530c34..09593a1e 100644
--- a/src/location/places/qplacedetailsreply.h
+++ b/src/location/places/qplacedetailsreply.h
@@ -47,7 +47,7 @@ class Q_LOCATION_EXPORT QPlaceDetailsReply : public QPlaceReply
 {
     Q_OBJECT
 public:
-    explicit QPlaceDetailsReply(QObject *parent = 0);
+    explicit QPlaceDetailsReply(QObject *parent = Q_NULLPTR);
     virtual ~QPlaceDetailsReply();
 
     QPlaceReply::Type type() const;
diff --git a/src/location/places/qplaceidreply.h b/src/location/places/qplaceidreply.h
index abdab7aa..ea44828b 100644
--- a/src/location/places/qplaceidreply.h
+++ b/src/location/places/qplaceidreply.h
@@ -55,7 +55,7 @@ public:
         RemoveCategory
     };
 
-    explicit QPlaceIdReply(OperationType operationType, QObject *parent = 0);
+    explicit QPlaceIdReply(OperationType operationType, QObject *parent = Q_NULLPTR);
     virtual ~QPlaceIdReply();
 
     QPlaceReply::Type type() const;
diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h
index 37e7c053..bd4b1676 100644
--- a/src/location/places/qplacemanager.h
+++ b/src/location/places/qplacemanager.h
@@ -112,7 +112,7 @@ Q_SIGNALS:
     void dataChanged();
 
 private:
-    QPlaceManager(QPlaceManagerEngine *engine, QObject *parent = 0);
+    explicit QPlaceManager(QPlaceManagerEngine *engine, QObject *parent = Q_NULLPTR);
     Q_DISABLE_COPY(QPlaceManager)
 
     QPlaceManagerEngine *d;
diff --git a/src/location/places/qplacemanagerengine.h b/src/location/places/qplacemanagerengine.h
index aca0a875..0c11278f 100644
--- a/src/location/places/qplacemanagerengine.h
+++ b/src/location/places/qplacemanagerengine.h
@@ -53,7 +53,7 @@ class Q_LOCATION_EXPORT QPlaceManagerEngine : public QObject
     Q_OBJECT
 
 public:
-    QPlaceManagerEngine(const QVariantMap &parameters, QObject *parent = 0);
+    explicit QPlaceManagerEngine(const QVariantMap &parameters, QObject *parent = Q_NULLPTR);
     virtual ~QPlaceManagerEngine();
 
     QString managerName() const;
diff --git a/src/location/places/qplacematchreply.h b/src/location/places/qplacematchreply.h
index e5935e33..df4b3fda 100644
--- a/src/location/places/qplacematchreply.h
+++ b/src/location/places/qplacematchreply.h
@@ -47,7 +47,7 @@ class Q_LOCATION_EXPORT QPlaceMatchReply : public QPlaceReply
 {
     Q_OBJECT
 public:
-    explicit QPlaceMatchReply(QObject *parent = 0);
+    explicit QPlaceMatchReply(QObject *parent = Q_NULLPTR);
     ~QPlaceMatchReply();
 
     QPlaceReply::Type type() const;
diff --git a/src/location/places/qplacereply.h b/src/location/places/qplacereply.h
index 987ab446..374c68b3 100644
--- a/src/location/places/qplacereply.h
+++ b/src/location/places/qplacereply.h
@@ -71,7 +71,7 @@ public:
         MatchReply
     };
 
-    explicit QPlaceReply(QObject *parent = 0);
+    explicit QPlaceReply(QObject *parent = Q_NULLPTR);
     ~QPlaceReply();
 
     bool isFinished() const;
@@ -89,7 +89,7 @@ Q_SIGNALS:
     void error(QPlaceReply::Error error, const QString &errorString = QString());
 
 protected:
-    QPlaceReply(QPlaceReplyPrivate *, QObject *parent = 0);
+    explicit QPlaceReply(QPlaceReplyPrivate *, QObject *parent = Q_NULLPTR);
     void setFinished(bool finished);
     void setError(QPlaceReply::Error error, const QString &errorString);
     QPlaceReplyPrivate *d_ptr;
diff --git a/src/location/places/qplacesearchreply.h b/src/location/places/qplacesearchreply.h
index ddf850bc..52c88899 100644
--- a/src/location/places/qplacesearchreply.h
+++ b/src/location/places/qplacesearchreply.h
@@ -49,7 +49,7 @@ class Q_LOCATION_EXPORT QPlaceSearchReply : public QPlaceReply
 {
     Q_OBJECT
 public:
-    explicit QPlaceSearchReply(QObject *parent = 0);
+    explicit QPlaceSearchReply(QObject *parent = Q_NULLPTR);
     ~QPlaceSearchReply();
 
     QPlaceReply::Type type() const;
diff --git a/src/location/places/qplacesearchsuggestionreply.h b/src/location/places/qplacesearchsuggestionreply.h
index 6aee36cb..3909b14f 100644
--- a/src/location/places/qplacesearchsuggestionreply.h
+++ b/src/location/places/qplacesearchsuggestionreply.h
@@ -49,7 +49,7 @@ class Q_LOCATION_EXPORT QPlaceSearchSuggestionReply : public QPlaceReply
 {
     Q_OBJECT
 public:
-    explicit QPlaceSearchSuggestionReply(QObject *parent = 0);
+    explicit QPlaceSearchSuggestionReply(QObject *parent = Q_NULLPTR);
     ~QPlaceSearchSuggestionReply();
 
     QStringList suggestions() const;
diff --git a/src/plugins/geoservices/mapbox/mapbox.pro b/src/plugins/geoservices/mapbox/mapbox.pro
index 7fdfa508..d4797e37 100644
--- a/src/plugins/geoservices/mapbox/mapbox.pro
+++ b/src/plugins/geoservices/mapbox/mapbox.pro
@@ -1,9 +1,6 @@
 TARGET = qtgeoservices_mapbox
-QT += location-private positioning-private network
 
-PLUGIN_TYPE = geoservices
-PLUGIN_CLASS_NAME = QGeoServiceProviderFactoryMapbox
-load(qt_plugin)
+QT += location-private positioning-private network
 
 HEADERS += \
     qgeoserviceproviderpluginmapbox.h \
@@ -20,3 +17,6 @@ SOURCES += \
 OTHER_FILES += \
     mapbox_plugin.json
 
+PLUGIN_TYPE = geoservices
+PLUGIN_CLASS_NAME = QGeoServiceProviderFactoryMapbox
+load(qt_plugin)
diff --git a/src/plugins/geoservices/nokia/nokia.pro b/src/plugins/geoservices/nokia/nokia.pro
index 62b04870..cd340f50 100644
--- a/src/plugins/geoservices/nokia/nokia.pro
+++ b/src/plugins/geoservices/nokia/nokia.pro
@@ -1,4 +1,5 @@
 TARGET = qtgeoservices_nokia
+
 QT += location-private positioning-private network
 
 contains(QT_CONFIG, location-china-support) {
@@ -7,10 +8,6 @@ contains(QT_CONFIG, location-china-support) {
     QT += systeminfo
 }
 
-PLUGIN_TYPE = geoservices
-PLUGIN_CLASS_NAME = QGeoServiceProviderFactoryNokia
-load(qt_plugin)
-
 HEADERS += \
             qgeocodereply_nokia.h \
             qgeocodexmlparser.h \
@@ -59,3 +56,6 @@ INCLUDEPATH += ../../../location/maps
 OTHER_FILES += \
     nokia_plugin.json
 
+PLUGIN_TYPE = geoservices
+PLUGIN_CLASS_NAME = QGeoServiceProviderFactoryNokia
+load(qt_plugin)
diff --git a/src/plugins/geoservices/osm/osm.pro b/src/plugins/geoservices/osm/osm.pro
index a00f1fb8..e73c16d7 100644
--- a/src/plugins/geoservices/osm/osm.pro
+++ b/src/plugins/geoservices/osm/osm.pro
@@ -1,9 +1,6 @@
 TARGET = qtgeoservices_osm
-QT += location-private positioning-private network
 
-PLUGIN_TYPE = geoservices
-PLUGIN_CLASS_NAME = QGeoServiceProviderFactoryOsm
-load(qt_plugin)
+QT += location-private positioning-private network
 
 HEADERS += \
     qgeoserviceproviderpluginosm.h \
@@ -37,3 +34,6 @@ SOURCES += \
 OTHER_FILES += \
     osm_plugin.json
 
+PLUGIN_TYPE = geoservices
+PLUGIN_CLASS_NAME = QGeoServiceProviderFactoryOsm
+load(qt_plugin)
diff --git a/src/plugins/position/android/src/src.pro b/src/plugins/position/android/src/src.pro
index 9c81dde5..3a19c85e 100644
--- a/src/plugins/position/android/src/src.pro
+++ b/src/plugins/position/android/src/src.pro
@@ -1,10 +1,6 @@
 TARGET = qtposition_android
-QT = core positioning
-
-PLUGIN_TYPE = position
-PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryAndroid
-load(qt_plugin)
 
+QT = core positioning
 
 HEADERS = \
     positionfactory_android.h \
@@ -19,3 +15,7 @@ SOURCES = \
     qgeosatelliteinfosource_android.cpp
 
 OTHER_FILES = plugin.json
+
+PLUGIN_TYPE = position
+PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryAndroid
+load(qt_plugin)
diff --git a/src/plugins/position/corelocation/corelocation.pro b/src/plugins/position/corelocation/corelocation.pro
index 1415643b..dbb5b6b3 100644
--- a/src/plugins/position/corelocation/corelocation.pro
+++ b/src/plugins/position/corelocation/corelocation.pro
@@ -1,9 +1,6 @@
 TARGET = qtposition_cl
-QT = core positioning
 
-PLUGIN_TYPE = position
-PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryCL
-load(qt_plugin)
+QT = core positioning
 
 OBJECTIVE_SOURCES += \
     qgeopositioninfosource_cl.mm \
@@ -19,3 +16,7 @@ OTHER_FILES += \
 osx: LIBS += -framework Foundation
 else: ios|tvos: LIBS += -framework CoreFoundation
 LIBS += -framework CoreLocation
+
+PLUGIN_TYPE = position
+PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryCL
+load(qt_plugin)
diff --git a/src/plugins/position/geoclue/geoclue.pro b/src/plugins/position/geoclue/geoclue.pro
index 0d9aab7d..3f75cbf0 100644
--- a/src/plugins/position/geoclue/geoclue.pro
+++ b/src/plugins/position/geoclue/geoclue.pro
@@ -1,9 +1,6 @@
 TARGET = qtposition_geoclue
-QT = core positioning dbus
 
-PLUGIN_TYPE = position
-PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryGeoclue
-load(qt_plugin)
+QT = core positioning dbus
 
 HEADERS += \
     qgeopositioninfosource_geocluemaster.h \
@@ -35,3 +32,7 @@ INCLUDEPATH += $$QT.location.includes $$OUT_PWD
 
 OTHER_FILES += \
     plugin.json
+
+PLUGIN_TYPE = position
+PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryGeoclue
+load(qt_plugin)
diff --git a/src/plugins/position/gypsy/gypsy.pro b/src/plugins/position/gypsy/gypsy.pro
index f5c5a087..be65f183 100644
--- a/src/plugins/position/gypsy/gypsy.pro
+++ b/src/plugins/position/gypsy/gypsy.pro
@@ -1,9 +1,6 @@
 TARGET = qtposition_gypsy
-QT = core positioning
 
-PLUGIN_TYPE = position
-PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryGypsy
-load(qt_plugin)
+QT = core positioning
 
 HEADERS += \
     qgeosatelliteinfosource_gypsy_p.h \
@@ -18,3 +15,7 @@ PKGCONFIG += gypsy gconf-2.0
 
 OTHER_FILES += \
     plugin.json
+
+PLUGIN_TYPE = position
+PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryGypsy
+load(qt_plugin)
diff --git a/src/plugins/position/positionpoll/positionpoll.pro b/src/plugins/position/positionpoll/positionpoll.pro
index cb84e79a..be60bf43 100644
--- a/src/plugins/position/positionpoll/positionpoll.pro
+++ b/src/plugins/position/positionpoll/positionpoll.pro
@@ -1,9 +1,6 @@
 TARGET = qtposition_positionpoll
-QT = core positioning
 
-PLUGIN_TYPE = position
-PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryPoll
-load(qt_plugin)
+QT = core positioning
 
 SOURCES += \
     qgeoareamonitor_polling.cpp \
@@ -15,3 +12,7 @@ HEADERS += \
 
 OTHER_FILES += \
     plugin.json
+
+PLUGIN_TYPE = position
+PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryPoll
+load(qt_plugin)
diff --git a/src/plugins/position/serialnmea/serialnmea.pro b/src/plugins/position/serialnmea/serialnmea.pro
index 81570837..bdeb3f13 100644
--- a/src/plugins/position/serialnmea/serialnmea.pro
+++ b/src/plugins/position/serialnmea/serialnmea.pro
@@ -1,9 +1,6 @@
 TARGET = qtposition_serialnmea
-QT = core positioning serialport
 
-PLUGIN_TYPE = position
-PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactorySerialNmea
-load(qt_plugin)
+QT = core positioning serialport
 
 HEADERS += \
     qgeopositioninfosourcefactory_serialnmea.h
@@ -13,3 +10,7 @@ SOURCES += \
 
 OTHER_FILES += \
     plugin.json
+
+PLUGIN_TYPE = position
+PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactorySerialNmea
+load(qt_plugin)
diff --git a/src/plugins/position/simulator/simulator.pro b/src/plugins/position/simulator/simulator.pro
index dc00ae1a..c3e6ea3c 100644
--- a/src/plugins/position/simulator/simulator.pro
+++ b/src/plugins/position/simulator/simulator.pro
@@ -1,12 +1,9 @@
 TARGET = qtposition_simulator
-QT = core network positioning
 
-PLUGIN_TYPE = position
-PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactorySimulator
-load(qt_plugin)
+QT = core network positioning simulator
+
 INCLUDEPATH += ../../../positioning
 
-QT += simulator
 DEFINES += QT_SIMULATOR
 SOURCES += qgeopositioninfosource_simulator.cpp \
             qgeosatelliteinfosource_simulator.cpp \
@@ -19,3 +16,7 @@ HEADERS += qgeopositioninfosource_simulator_p.h \
 
 OTHER_FILES += \
     plugin.json
+
+PLUGIN_TYPE = position
+PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactorySimulator
+load(qt_plugin)
diff --git a/src/plugins/position/winrt/winrt.pro b/src/plugins/position/winrt/winrt.pro
index c58c6c18..bc740671 100644
--- a/src/plugins/position/winrt/winrt.pro
+++ b/src/plugins/position/winrt/winrt.pro
@@ -1,9 +1,6 @@
 TARGET = qtposition_winrt
-QT = core core-private positioning
 
-PLUGIN_TYPE = position
-PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryWinRT
-load(qt_plugin)
+QT = core core-private positioning
 
 SOURCES += qgeopositioninfosource_winrt.cpp \
     qgeopositioninfosourcefactory_winrt.cpp
@@ -12,3 +9,7 @@ HEADERS += qgeopositioninfosource_winrt_p.h \
 
 OTHER_FILES += \
     plugin.json
+
+PLUGIN_TYPE = position
+PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryWinRT
+load(qt_plugin)
diff --git a/src/positioning/doc/src/examples/qtpositioning-examples.qdoc b/src/positioning/doc/src/qtpositioning-examples.qdoc
index 57d129a0..57d129a0 100644
--- a/src/positioning/doc/src/examples/qtpositioning-examples.qdoc
+++ b/src/positioning/doc/src/qtpositioning-examples.qdoc
diff --git a/src/positioning/qnmeapositioninfosource.h b/src/positioning/qnmeapositioninfosource.h
index 363c6d33..d951f577 100644
--- a/src/positioning/qnmeapositioninfosource.h
+++ b/src/positioning/qnmeapositioninfosource.h
@@ -55,7 +55,7 @@ public:
         SimulationMode
     };
 
-    explicit QNmeaPositionInfoSource(UpdateMode updateMode, QObject *parent = 0);
+    explicit QNmeaPositionInfoSource(UpdateMode updateMode, QObject *parent = Q_NULLPTR);
     ~QNmeaPositionInfoSource();
 
     void setUserEquivalentRangeError(double uere);