Merge remote-tracking branch 'origin/5.11' into wip/navigation

Change-Id: Iff9103a681e8891f4fbc6e5a5f8418061507e600

87 files changed, 301 insertions, 299 deletions

diff --git a/examples/location/planespotter/main.cpp b/examples/location/planespotter/main.cpp
index 24e4c4d3..76f8cc26 100644
--- a/examples/location/planespotter/main.cpp
+++ b/examples/location/planespotter/main.cpp
@@ -147,7 +147,7 @@ signals:
     void fromChanged();
 
 protected:
-    void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE
+    void timerEvent(QTimerEvent *event) override
     {
         if (!event)
             return;
diff --git a/src/imports/locationlabs/locationlabs.pro b/src/imports/locationlabs/locationlabs.pro
index 65941355..618e1492 100644
--- a/src/imports/locationlabs/locationlabs.pro
+++ b/src/imports/locationlabs/locationlabs.pro
@@ -1,6 +1,7 @@
 QT += quick-private network positioning-private location-private locationlabs-private qml-private core-private gui-private
 
 TARGET = locationlabsplugin
+CXX_MODULE = $$TARGET
 TARGETPATH = Qt/labs/location
 IMPORT_VERSION = 5.11
 
diff --git a/src/location/configure.json b/src/location/configure.json
index 8f74a4be..4695b1c0 100644
--- a/src/location/configure.json
+++ b/src/location/configure.json
@@ -5,7 +5,7 @@
     ],
 
     "features": {
-        "labs_plugin": {
+        "locationlabs_plugin": {
             "label": "Qt.labs.location experimental QML plugin",
             "purpose": "Provides experimental QtLocation QML types",
             "section": "Location",
@@ -60,7 +60,7 @@
         {
             "section": "Qt Location",
             "entries": [
-                "labs_plugin",
+                "locationlabs_plugin",
                 {
                     "section": "Geoservice plugins",
                     "entries": [
diff --git a/src/location/declarativemaps/mapitemviewdelegateincubator_p.h b/src/location/declarativemaps/mapitemviewdelegateincubator_p.h
index f03ae405..6ee9f6af 100644
--- a/src/location/declarativemaps/mapitemviewdelegateincubator_p.h
+++ b/src/location/declarativemaps/mapitemviewdelegateincubator_p.h
@@ -62,7 +62,7 @@ public:
     MapItemViewDelegateIncubator(QDeclarativeGeoMapItemView *view, QDeclarativeGeoMapItemViewItemData *itemData, bool batched = true);
 
 protected:
-    void statusChanged(Status status) Q_DECL_OVERRIDE;
+    void statusChanged(Status status) override;
 
 private:
     QDeclarativeGeoMapItemView *m_view;
diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem_p.h b/src/location/declarativemaps/qdeclarativecirclemapitem_p.h
index c117b444..bb359ee3 100644
--- a/src/location/declarativemaps/qdeclarativecirclemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativecirclemapitem_p.h
@@ -78,8 +78,8 @@ public:
     explicit QDeclarativeCircleMapItem(QQuickItem *parent = 0);
     ~QDeclarativeCircleMapItem();
 
-    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) Q_DECL_OVERRIDE;
-    virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
+    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) override;
+    virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) override;
 
     QGeoCoordinate center();
     void setCenter(const QGeoCoordinate &center);
@@ -92,9 +92,9 @@ public:
 
     QDeclarativeMapLineProperties *border();
 
-    bool contains(const QPointF &point) const Q_DECL_OVERRIDE;
-    const QGeoShape &geoShape() const Q_DECL_OVERRIDE;
-    QGeoMap::ItemType itemType() const Q_DECL_OVERRIDE;
+    bool contains(const QPointF &point) const override;
+    const QGeoShape &geoShape() const override;
+    QGeoMap::ItemType itemType() const override;
 
     static bool crossEarthPole(const QGeoCoordinate &center, qreal distance);
     static void calculatePeripheralPoints(QList<QGeoCoordinate> &path, const QGeoCoordinate &center,
@@ -108,12 +108,12 @@ Q_SIGNALS:
     void colorChanged(const QColor &color);
 
 protected:
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
-    void updatePolish() Q_DECL_OVERRIDE;
+    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void updatePolish() override;
 
 protected Q_SLOTS:
     void markSourceDirtyAndUpdate();
-    virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) Q_DECL_OVERRIDE;
+    virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) override;
 
 private:
     void updateCirclePath();
diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp
index c5d01ebd..9f53c4d8 100644
--- a/src/location/declarativemaps/qdeclarativegeomap.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomap.cpp
@@ -342,7 +342,7 @@ static QDeclarativeGeoMapType *findMapType(const QList<QDeclarativeGeoMapType *>
     for (int i = 0; i < types.size(); ++i)
         if (types[i]->mapType() == type)
             return types[i];
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 void QDeclarativeGeoMap::onSupportedMapTypesChanged()
diff --git a/src/location/declarativemaps/qdeclarativegeomap_p.h b/src/location/declarativemaps/qdeclarativegeomap_p.h
index 27ee9822..508a9ed5 100644
--- a/src/location/declarativemaps/qdeclarativegeomap_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomap_p.h
@@ -222,23 +222,23 @@ Q_SIGNALS:
     void mapObjectsChanged();
 
 protected:
-    void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE ;
-    void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE ;
-    void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE ;
-    void mouseUngrabEvent() Q_DECL_OVERRIDE ;
-    void touchUngrabEvent() Q_DECL_OVERRIDE;
-    void touchEvent(QTouchEvent *event) Q_DECL_OVERRIDE ;
+    void mousePressEvent(QMouseEvent *event) override ;
+    void mouseMoveEvent(QMouseEvent *event) override ;
+    void mouseReleaseEvent(QMouseEvent *event) override ;
+    void mouseUngrabEvent() override ;
+    void touchUngrabEvent() override;
+    void touchEvent(QTouchEvent *event) override ;
 #if QT_CONFIG(wheelevent)
-    void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE ;
+    void wheelEvent(QWheelEvent *event) override ;
 #endif
 
-    bool childMouseEventFilter(QQuickItem *item, QEvent *event) Q_DECL_OVERRIDE;
+    bool childMouseEventFilter(QQuickItem *item, QEvent *event) override;
     bool sendMouseEvent(QMouseEvent *event);
     bool sendTouchEvent(QTouchEvent *event);
 
-    void componentComplete() Q_DECL_OVERRIDE;
-    QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
+    void componentComplete() override;
+    QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override;
+    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
 
     void setError(QGeoServiceProvider::Error error, const QString &errorString);
     void initialize();
diff --git a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp
index 1a8489eb..3e68ac97 100644
--- a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp
@@ -123,7 +123,7 @@ void QDeclarativeGeoMapCopyrightNotice::setMapSource(QDeclarativeGeoMap *mapSour
         m_mapSource->m_map->disconnect(this);
         m_copyrightsHtml->clear();
         m_copyrightsImage = QImage();
-        m_mapSource = Q_NULLPTR;
+        m_mapSource = nullptr;
     }
 
     if (mapSource) {
diff --git a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h
index 0d7f7a20..7189e65c 100644
--- a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h
@@ -66,7 +66,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMapCopyrightNotice : public QQuic
     Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet NOTIFY styleSheetChanged)
 
 public:
-    QDeclarativeGeoMapCopyrightNotice(QQuickItem *parent = Q_NULLPTR);
+    QDeclarativeGeoMapCopyrightNotice(QQuickItem *parent = nullptr);
     ~QDeclarativeGeoMapCopyrightNotice();
 
     void setCopyrightsZ(int copyrightsZ);
@@ -92,9 +92,9 @@ signals:
     void styleSheetChanged(const QString &styleSheet);
 
 protected:
-    void paint(QPainter *painter) Q_DECL_OVERRIDE;
-    void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
+    void paint(QPainter *painter) override;
+    void mousePressEvent(QMouseEvent *event) override;
+    void mouseReleaseEvent(QMouseEvent *event) override;
     void rasterizeHtmlAndUpdate();
     void connectMap();
 
diff --git a/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h b/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h
index 2035a997..3e757371 100644
--- a/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h
@@ -65,7 +65,7 @@ public:
     QMapQuickItemMatrix4x4(QObject *parent = nullptr);
 
     void setMatrix(const QMatrix4x4& matrix);
-    void applyTo(QMatrix4x4 *matrix) const Q_DECL_OVERRIDE;
+    void applyTo(QMatrix4x4 *matrix) const override;
 
     QMatrix4x4 m_matrix;
 };
@@ -82,7 +82,7 @@ public:
     explicit QDeclarativeGeoMapQuickItem(QQuickItem *parent = 0);
     ~QDeclarativeGeoMapQuickItem();
 
-    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) Q_DECL_OVERRIDE;
+    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) override;
 
     void setCoordinate(const QGeoCoordinate &coordinate);
     QGeoCoordinate coordinate();
@@ -96,8 +96,8 @@ public:
     void setZoomLevel(qreal zoomLevel);
     qreal zoomLevel() const;
 
-    const QGeoShape &geoShape() const Q_DECL_OVERRIDE;
-    QGeoMap::ItemType itemType() const Q_DECL_OVERRIDE;
+    const QGeoShape &geoShape() const override;
+    QGeoMap::ItemType itemType() const override;
 
 Q_SIGNALS:
     void coordinateChanged();
@@ -106,13 +106,13 @@ Q_SIGNALS:
     void zoomLevelChanged();
 
 protected:
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
-    void updatePolish() Q_DECL_OVERRIDE;
-    bool childMouseEventFilter(QQuickItem *item, QEvent *event) Q_DECL_OVERRIDE;
+    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void updatePolish() override;
+    bool childMouseEventFilter(QQuickItem *item, QEvent *event) override;
 
 protected Q_SLOTS:
-    virtual void afterChildrenChanged() Q_DECL_OVERRIDE;
-    virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) Q_DECL_OVERRIDE;
+    virtual void afterChildrenChanged() override;
+    virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) override;
 
 private:
     qreal scaleFactor();
diff --git a/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h b/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h
index 2add07dd..13768411 100644
--- a/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h
+++ b/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h
@@ -113,7 +113,7 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoServiceProvider : public QObject,
     Q_INTERFACES(QQmlParserStatus)
 
 public:
-    explicit QDeclarativeGeoServiceProvider(QObject *parent = Q_NULLPTR);
+    explicit QDeclarativeGeoServiceProvider(QObject *parent = nullptr);
     ~QDeclarativeGeoServiceProvider();
 
     enum RoutingFeature {
diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h b/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h
index a928ae39..c49495ab 100644
--- a/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h
@@ -89,9 +89,9 @@ public:
     explicit QDeclarativePolygonMapItem(QQuickItem *parent = 0);
     ~QDeclarativePolygonMapItem();
 
-    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) Q_DECL_OVERRIDE;
+    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) override;
     //from QuickItem
-    virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
+    virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) override;
 
     Q_INVOKABLE void addCoordinate(const QGeoCoordinate &coordinate);
     Q_INVOKABLE void removeCoordinate(const QGeoCoordinate &coordinate);
@@ -104,22 +104,22 @@ public:
 
     QDeclarativeMapLineProperties *border();
 
-    bool contains(const QPointF &point) const Q_DECL_OVERRIDE;
-    const QGeoShape &geoShape() const Q_DECL_OVERRIDE;
-    QGeoMap::ItemType itemType() const Q_DECL_OVERRIDE;
+    bool contains(const QPointF &point) const override;
+    const QGeoShape &geoShape() const override;
+    QGeoMap::ItemType itemType() const override;
 
 Q_SIGNALS:
     void pathChanged();
     void colorChanged(const QColor &color);
 
 protected:
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
-    void updatePolish() Q_DECL_OVERRIDE;
+    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void updatePolish() override;
 
 protected Q_SLOTS:
     void markSourceDirtyAndUpdate();
     void handleBorderUpdated();
-    virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) Q_DECL_OVERRIDE;
+    virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) override;
 
 private:
     void regenerateCache();
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
index 6b3c42e9..8a5c1122 100644
--- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
@@ -126,9 +126,9 @@ public:
     explicit QDeclarativePolylineMapItem(QQuickItem *parent = 0);
     ~QDeclarativePolylineMapItem();
 
-    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) Q_DECL_OVERRIDE;
+    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) override;
        //from QuickItem
-    virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
+    virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) override;
 
     Q_INVOKABLE int pathLength() const;
     Q_INVOKABLE void addCoordinate(const QGeoCoordinate &coordinate);
@@ -143,9 +143,9 @@ public:
     virtual void setPath(const QJSValue &value);
     Q_INVOKABLE void setPath(const QGeoPath &path);
 
-    bool contains(const QPointF &point) const Q_DECL_OVERRIDE;
-    const QGeoShape &geoShape() const Q_DECL_OVERRIDE;
-    QGeoMap::ItemType itemType() const Q_DECL_OVERRIDE;
+    bool contains(const QPointF &point) const override;
+    const QGeoShape &geoShape() const override;
+    QGeoMap::ItemType itemType() const override;
 
     QDeclarativeMapLineProperties *line();
 
@@ -153,14 +153,14 @@ Q_SIGNALS:
     void pathChanged();
 
 protected:
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
+    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
     void setPathFromGeoList(const QList<QGeoCoordinate> &path);
-    void updatePolish() Q_DECL_OVERRIDE;
+    void updatePolish() override;
 
 protected Q_SLOTS:
     void markSourceDirtyAndUpdate();
     void updateAfterLinePropertiesChanged();
-    virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) Q_DECL_OVERRIDE;
+    virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) override;
 
 private:
     void regenerateCache();
diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h b/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h
index ca7ca9b7..1642d700 100644
--- a/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h
@@ -73,9 +73,9 @@ public:
     explicit QDeclarativeRectangleMapItem(QQuickItem *parent = 0);
     ~QDeclarativeRectangleMapItem();
 
-    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) Q_DECL_OVERRIDE;
+    virtual void setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) override;
     //from QuickItem
-    virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
+    virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *) override;
 
     QGeoCoordinate topLeft();
     void setTopLeft(const QGeoCoordinate &center);
@@ -88,9 +88,9 @@ public:
 
     QDeclarativeMapLineProperties *border();
 
-    bool contains(const QPointF &point) const Q_DECL_OVERRIDE;
-    const QGeoShape &geoShape() const Q_DECL_OVERRIDE;
-    QGeoMap::ItemType itemType() const Q_DECL_OVERRIDE;
+    bool contains(const QPointF &point) const override;
+    const QGeoShape &geoShape() const override;
+    QGeoMap::ItemType itemType() const override;
 
 Q_SIGNALS:
     void topLeftChanged(const QGeoCoordinate &topLeft);
@@ -99,12 +99,12 @@ Q_SIGNALS:
 
 protected:
     void updatePath();
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
-    void updatePolish() Q_DECL_OVERRIDE;
+    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void updatePolish() override;
 
 protected Q_SLOTS:
     void markSourceDirtyAndUpdate();
-    virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) Q_DECL_OVERRIDE;
+    virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) override;
 
 private:
     QGeoRectangle rectangle_;
diff --git a/src/location/declarativemaps/qdeclarativeroutemapitem_p.h b/src/location/declarativemaps/qdeclarativeroutemapitem_p.h
index ad959837..a0b171b0 100644
--- a/src/location/declarativemaps/qdeclarativeroutemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativeroutemapitem_p.h
@@ -79,7 +79,7 @@ private slots:
     void updateRoutePath();
 
 protected:
-    void setPath(const QJSValue &value) Q_DECL_OVERRIDE;
+    void setPath(const QJSValue &value) override;
 
 private:
     QDeclarativeGeoRoute *route_;
diff --git a/src/location/declarativemaps/qgeomapobject_p.h b/src/location/declarativemaps/qgeomapobject_p.h
index 91e5667f..3c18cc8f 100644
--- a/src/location/declarativemaps/qgeomapobject_p.h
+++ b/src/location/declarativemaps/qgeomapobject_p.h
@@ -62,6 +62,7 @@ class Q_LOCATION_PRIVATE_EXPORT QGeoMapObject : public QParameterizableObject, p
 
     Q_PROPERTY(bool visible READ visible WRITE setVisible NOTIFY visibleChanged)
     Q_PROPERTY(Type type READ type CONSTANT)
+    Q_INTERFACES(QQmlParserStatus)
 
 public:
     enum Feature {
diff --git a/src/location/maps/qgeocodereply.h b/src/location/maps/qgeocodereply.h
index c92bc606..c41e740d 100644
--- a/src/location/maps/qgeocodereply.h
+++ b/src/location/maps/qgeocodereply.h
@@ -63,7 +63,7 @@ public:
         UnknownError
     };
 
-    explicit QGeoCodeReply(Error error, const QString &errorString, QObject *parent = Q_NULLPTR);
+    explicit QGeoCodeReply(Error error, const QString &errorString, QObject *parent = nullptr);
     virtual ~QGeoCodeReply();
 
     bool isFinished() const;
@@ -84,7 +84,7 @@ Q_SIGNALS:
     void error(QGeoCodeReply::Error error, const QString &errorString = QString());
 
 protected:
-    explicit QGeoCodeReply(QObject *parent = Q_NULLPTR);
+    explicit QGeoCodeReply(QObject *parent = 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 eb366f68..0d89b054 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:
-    explicit QGeoCodingManager(QGeoCodingManagerEngine *engine, QObject *parent = Q_NULLPTR);
+    explicit QGeoCodingManager(QGeoCodingManagerEngine *engine, QObject *parent = nullptr);
 
     QGeoCodingManagerPrivate *d_ptr;
     Q_DISABLE_COPY(QGeoCodingManager)
diff --git a/src/location/maps/qgeocodingmanagerengine.h b/src/location/maps/qgeocodingmanagerengine.h
index ce7021a0..eb3bd147 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:
-    explicit QGeoCodingManagerEngine(const QVariantMap &parameters, QObject *parent = Q_NULLPTR);
+    explicit QGeoCodingManagerEngine(const QVariantMap &parameters, QObject *parent = nullptr);
     virtual ~QGeoCodingManagerEngine();
 
     QString managerName() const;
diff --git a/src/location/maps/qgeofiletilecache_p.h b/src/location/maps/qgeofiletilecache_p.h
index 1712a9e3..ecbf7084 100644
--- a/src/location/maps/qgeofiletilecache_p.h
+++ b/src/location/maps/qgeofiletilecache_p.h
@@ -102,30 +102,30 @@ public:
     QGeoFileTileCache(const QString &directory = QString(), QObject *parent = 0);
     ~QGeoFileTileCache();
 
-    void setMaxDiskUsage(int diskUsage) Q_DECL_OVERRIDE;
-    int maxDiskUsage() const Q_DECL_OVERRIDE;
-    int diskUsage() const Q_DECL_OVERRIDE;
-
-    void setMaxMemoryUsage(int memoryUsage) Q_DECL_OVERRIDE;
-    int maxMemoryUsage() const Q_DECL_OVERRIDE;
-    int memoryUsage() const Q_DECL_OVERRIDE;
-
-    void setMinTextureUsage(int textureUsage) Q_DECL_OVERRIDE;
-    void setExtraTextureUsage(int textureUsage) Q_DECL_OVERRIDE;
-    int maxTextureUsage() const Q_DECL_OVERRIDE;
-    int minTextureUsage() const Q_DECL_OVERRIDE;
-    int textureUsage() const Q_DECL_OVERRIDE;
-    void clearAll() Q_DECL_OVERRIDE;
+    void setMaxDiskUsage(int diskUsage) override;
+    int maxDiskUsage() const override;
+    int diskUsage() const override;
+
+    void setMaxMemoryUsage(int memoryUsage) override;
+    int maxMemoryUsage() const override;
+    int memoryUsage() const override;
+
+    void setMinTextureUsage(int textureUsage) override;
+    void setExtraTextureUsage(int textureUsage) override;
+    int maxTextureUsage() const override;
+    int minTextureUsage() const override;
+    int textureUsage() const override;
+    void clearAll() override;
     void clearMapId(const int mapId);
-    void setCostStrategyDisk(CostStrategy costStrategy) Q_DECL_OVERRIDE;
-    CostStrategy costStrategyDisk() const Q_DECL_OVERRIDE;
-    void setCostStrategyMemory(CostStrategy costStrategy) Q_DECL_OVERRIDE;
-    CostStrategy costStrategyMemory() const Q_DECL_OVERRIDE;
-    void setCostStrategyTexture(CostStrategy costStrategy) Q_DECL_OVERRIDE;
-    CostStrategy costStrategyTexture() const Q_DECL_OVERRIDE;
+    void setCostStrategyDisk(CostStrategy costStrategy) override;
+    CostStrategy costStrategyDisk() const override;
+    void setCostStrategyMemory(CostStrategy costStrategy) override;
+    CostStrategy costStrategyMemory() const override;
+    void setCostStrategyTexture(CostStrategy costStrategy) override;
+    CostStrategy costStrategyTexture() const override;
 
 
-    QSharedPointer<QGeoTileTexture> get(const QGeoTileSpec &spec) Q_DECL_OVERRIDE;
+    QSharedPointer<QGeoTileTexture> get(const QGeoTileSpec &spec) override;
 
     // can be called without a specific tileCache pointer
     static void evictFromDiskCache(QGeoCachedTileDisk *td);
@@ -134,14 +134,14 @@ public:
     void insert(const QGeoTileSpec &spec,
                 const QByteArray &bytes,
                 const QString &format,
-                QAbstractGeoTileCache::CacheAreas areas = QAbstractGeoTileCache::AllCaches) Q_DECL_OVERRIDE;
+                QAbstractGeoTileCache::CacheAreas areas = QAbstractGeoTileCache::AllCaches) override;
 
     static QString tileSpecToFilenameDefault(const QGeoTileSpec &spec, const QString &format, const QString &directory);
     static QGeoTileSpec filenameToTileSpecDefault(const QString &filename);
 
 protected:
-    void init() Q_DECL_OVERRIDE;
-    void printStats() Q_DECL_OVERRIDE;
+    void init() override;
+    void printStats() override;
     void loadTiles();
 
     QString directory() const;
diff --git a/src/location/maps/qgeorouteparser_p.h b/src/location/maps/qgeorouteparser_p.h
index 3d966d65..33c3a4db 100644
--- a/src/location/maps/qgeorouteparser_p.h
+++ b/src/location/maps/qgeorouteparser_p.h
@@ -68,7 +68,7 @@ public:
     QUrl requestUrl(const QGeoRouteRequest &request, const QString &prefix) const;
 
 protected:
-    QGeoRouteParser(QGeoRouteParserPrivate &dd, QObject *parent = Q_NULLPTR);
+    QGeoRouteParser(QGeoRouteParserPrivate &dd, QObject *parent = nullptr);
 
 private:
     Q_DISABLE_COPY(QGeoRouteParser)
diff --git a/src/location/maps/qgeorouteparserosrmv4.cpp b/src/location/maps/qgeorouteparserosrmv4.cpp
index 7321fb6f..bd36e7f3 100644
--- a/src/location/maps/qgeorouteparserosrmv4.cpp
+++ b/src/location/maps/qgeorouteparserosrmv4.cpp
@@ -310,8 +310,8 @@ public:
     QGeoRouteParserOsrmV4Private();
     virtual ~QGeoRouteParserOsrmV4Private();
 
-    QGeoRouteReply::Error parseReply(QList<QGeoRoute> &routes, QString &errorString, const QByteArray &reply) const Q_DECL_OVERRIDE;
-    QUrl requestUrl(const QGeoRouteRequest &request, const QString &prefix) const Q_DECL_OVERRIDE;
+    QGeoRouteReply::Error parseReply(QList<QGeoRoute> &routes, QString &errorString, const QByteArray &reply) const override;
+    QUrl requestUrl(const QGeoRouteRequest &request, const QString &prefix) const override;
 };
 
 QGeoRouteParserOsrmV4Private::QGeoRouteParserOsrmV4Private() : QGeoRouteParserPrivate()
diff --git a/src/location/maps/qgeorouteparserosrmv4_p.h b/src/location/maps/qgeorouteparserosrmv4_p.h
index 97bb43ea..d58c0547 100644
--- a/src/location/maps/qgeorouteparserosrmv4_p.h
+++ b/src/location/maps/qgeorouteparserosrmv4_p.h
@@ -60,7 +60,7 @@ class Q_LOCATION_PRIVATE_EXPORT QGeoRouteParserOsrmV4 : public QGeoRouteParser
     Q_DECLARE_PRIVATE(QGeoRouteParserOsrmV4)
 
 public:
-    QGeoRouteParserOsrmV4(QObject *parent = Q_NULLPTR);
+    QGeoRouteParserOsrmV4(QObject *parent = nullptr);
     virtual ~QGeoRouteParserOsrmV4();
 
 private:
diff --git a/src/location/maps/qgeorouteparserosrmv5.cpp b/src/location/maps/qgeorouteparserosrmv5.cpp
index 83419b20..df6c65ef 100644
--- a/src/location/maps/qgeorouteparserosrmv5.cpp
+++ b/src/location/maps/qgeorouteparserosrmv5.cpp
@@ -857,8 +857,8 @@ public:
     QGeoRouteParserOsrmV5Private();
     virtual ~QGeoRouteParserOsrmV5Private();
 
-    QGeoRouteReply::Error parseReply(QList<QGeoRoute> &routes, QString &errorString, const QByteArray &reply) const Q_DECL_OVERRIDE;
-    QUrl requestUrl(const QGeoRouteRequest &request, const QString &prefix) const Q_DECL_OVERRIDE;
+    QGeoRouteReply::Error parseReply(QList<QGeoRoute> &routes, QString &errorString, const QByteArray &reply) const override;
+    QUrl requestUrl(const QGeoRouteRequest &request, const QString &prefix) const override;
 
     bool m_useServerText = false;
     QString m_accessToken;
diff --git a/src/location/maps/qgeorouteparserosrmv5_p.h b/src/location/maps/qgeorouteparserosrmv5_p.h
index c6ad0367..598dcde7 100644
--- a/src/location/maps/qgeorouteparserosrmv5_p.h
+++ b/src/location/maps/qgeorouteparserosrmv5_p.h
@@ -60,7 +60,7 @@ class Q_LOCATION_PRIVATE_EXPORT QGeoRouteParserOsrmV5 : public QGeoRouteParser
     Q_DECLARE_PRIVATE(QGeoRouteParserOsrmV5)
 
 public:
-    QGeoRouteParserOsrmV5(QObject *parent = Q_NULLPTR, bool useServerText = false);
+    QGeoRouteParserOsrmV5(QObject *parent = nullptr, bool useServerText = false);
     virtual ~QGeoRouteParserOsrmV5();
 
     void setAccessToken(const QString &token);
diff --git a/src/location/maps/qgeoroutereply.h b/src/location/maps/qgeoroutereply.h
index c1d6e8d1..f873b999 100644
--- a/src/location/maps/qgeoroutereply.h
+++ b/src/location/maps/qgeoroutereply.h
@@ -60,7 +60,7 @@ public:
         UnknownError
     };
 
-    explicit QGeoRouteReply(Error error, const QString &errorString, QObject *parent = Q_NULLPTR);
+    explicit QGeoRouteReply(Error error, const QString &errorString, QObject *parent = nullptr);
     virtual ~QGeoRouteReply();
 
     bool isFinished() const;
@@ -78,7 +78,7 @@ Q_SIGNALS:
     void error(QGeoRouteReply::Error error, const QString &errorString = QString());
 
 protected:
-    explicit QGeoRouteReply(const QGeoRouteRequest &request, QObject *parent = Q_NULLPTR);
+    explicit QGeoRouteReply(const QGeoRouteRequest &request, QObject *parent = 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 56cd8e51..dd622385 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:
-    explicit QGeoRoutingManager(QGeoRoutingManagerEngine *engine, QObject *parent = Q_NULLPTR);
+    explicit QGeoRoutingManager(QGeoRoutingManagerEngine *engine, QObject *parent = nullptr);
 
     QGeoRoutingManagerPrivate *d_ptr;
     Q_DISABLE_COPY(QGeoRoutingManager)
diff --git a/src/location/maps/qgeoroutingmanagerengine.h b/src/location/maps/qgeoroutingmanagerengine.h
index 21aef7ce..18356b7e 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:
-    explicit QGeoRoutingManagerEngine(const QVariantMap &parameters, QObject *parent = Q_NULLPTR);
+    explicit QGeoRoutingManagerEngine(const QVariantMap &parameters, QObject *parent = nullptr);
     virtual ~QGeoRoutingManagerEngine();
 
     QString managerName() const;
diff --git a/src/location/maps/qgeotiledmap_p.h b/src/location/maps/qgeotiledmap_p.h
index 6152d60d..ad3c9af9 100644
--- a/src/location/maps/qgeotiledmap_p.h
+++ b/src/location/maps/qgeotiledmap_p.h
@@ -84,15 +84,15 @@ public:
     void updateTile(const QGeoTileSpec &spec);
     void setPrefetchStyle(PrefetchStyle style);
 
-    void prefetchData() Q_DECL_OVERRIDE;
-    void clearData() Q_DECL_OVERRIDE;
+    void prefetchData() override;
+    void clearData() override;
     Capabilities capabilities() const override;
 
 public Q_SLOTS:
     virtual void clearScene(int mapId);
 
 protected:
-    QSGNode *updateSceneGraph(QSGNode *, QQuickWindow *window) Q_DECL_OVERRIDE;
+    QSGNode *updateSceneGraph(QSGNode *, QQuickWindow *window) override;
     virtual void evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles);
 
     QGeoTiledMap(QGeoTiledMapPrivate &dd, QGeoTiledMappingManagerEngine *engine, QObject *parent);
diff --git a/src/location/maps/qgeotiledmap_p_p.h b/src/location/maps/qgeotiledmap_p_p.h
index 3dc589ae..d3791d49 100644
--- a/src/location/maps/qgeotiledmap_p_p.h
+++ b/src/location/maps/qgeotiledmap_p_p.h
@@ -83,9 +83,9 @@ public:
     void onCameraCapabilitiesChanged(const QGeoCameraCapabilities &oldCameraCapabilities);
 
 protected:
-    void changeViewportSize(const QSize& size) Q_DECL_OVERRIDE;
-    void changeCameraData(const QGeoCameraData &cameraData) Q_DECL_OVERRIDE;
-    void changeActiveMapType(const QGeoMapType mapType) Q_DECL_OVERRIDE;
+    void changeViewportSize(const QSize& size) override;
+    void changeCameraData(const QGeoCameraData &cameraData) override;
+    void changeActiveMapType(const QGeoMapType mapType) override;
     void changeTileVersion(int version);
     void clearScene();
 
diff --git a/src/location/maps/qgeotiledmappingmanagerengine_p.h b/src/location/maps/qgeotiledmappingmanagerengine_p.h
index 929e92f8..a7b4b1d0 100644
--- a/src/location/maps/qgeotiledmappingmanagerengine_p.h
+++ b/src/location/maps/qgeotiledmappingmanagerengine_p.h
@@ -76,7 +76,7 @@ public:
 
     QGeoTileFetcher *tileFetcher();
 
-    QGeoMap *createMap() Q_DECL_OVERRIDE;
+    QGeoMap *createMap() override;
     void releaseMap(QGeoTiledMap *map);
 
     QSize tileSize() const;
diff --git a/src/location/maps/qnavigationmanagerengine_p.h b/src/location/maps/qnavigationmanagerengine_p.h
index 5b8bd185..0aa5509e 100644
--- a/src/location/maps/qnavigationmanagerengine_p.h
+++ b/src/location/maps/qnavigationmanagerengine_p.h
@@ -64,7 +64,7 @@ class Q_LOCATION_PRIVATE_EXPORT QNavigationManagerEngine : public QObject
 {
     Q_OBJECT
 public:
-    explicit QNavigationManagerEngine(const QVariantMap &parameters, QObject *parent = Q_NULLPTR);
+    explicit QNavigationManagerEngine(const QVariantMap &parameters, QObject *parent = nullptr);
     virtual ~QNavigationManagerEngine();
 
     void setManagerName(const QString &name);
diff --git a/src/location/places/qplacecontentreply.h b/src/location/places/qplacecontentreply.h
index fa96a0e2..929d3384 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 = Q_NULLPTR);
+    explicit QPlaceContentReply(QObject *parent = nullptr);
     virtual ~QPlaceContentReply();
 
     QPlaceReply::Type type() const;
diff --git a/src/location/places/qplacedetailsreply.h b/src/location/places/qplacedetailsreply.h
index 09593a1e..6c3acca7 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 = Q_NULLPTR);
+    explicit QPlaceDetailsReply(QObject *parent = nullptr);
     virtual ~QPlaceDetailsReply();
 
     QPlaceReply::Type type() const;
diff --git a/src/location/places/qplaceidreply.h b/src/location/places/qplaceidreply.h
index ea44828b..6ecf12c8 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 = Q_NULLPTR);
+    explicit QPlaceIdReply(OperationType operationType, QObject *parent = nullptr);
     virtual ~QPlaceIdReply();
 
     QPlaceReply::Type type() const;
diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h
index bd4b1676..146bdd02 100644
--- a/src/location/places/qplacemanager.h
+++ b/src/location/places/qplacemanager.h
@@ -112,7 +112,7 @@ Q_SIGNALS:
     void dataChanged();
 
 private:
-    explicit QPlaceManager(QPlaceManagerEngine *engine, QObject *parent = Q_NULLPTR);
+    explicit QPlaceManager(QPlaceManagerEngine *engine, QObject *parent = nullptr);
     Q_DISABLE_COPY(QPlaceManager)
 
     QPlaceManagerEngine *d;
diff --git a/src/location/places/qplacemanagerengine.h b/src/location/places/qplacemanagerengine.h
index 0c11278f..9528cc22 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:
-    explicit QPlaceManagerEngine(const QVariantMap &parameters, QObject *parent = Q_NULLPTR);
+    explicit QPlaceManagerEngine(const QVariantMap &parameters, QObject *parent = nullptr);
     virtual ~QPlaceManagerEngine();
 
     QString managerName() const;
diff --git a/src/location/places/qplacematchreply.h b/src/location/places/qplacematchreply.h
index df4b3fda..8e195663 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 = Q_NULLPTR);
+    explicit QPlaceMatchReply(QObject *parent = nullptr);
     ~QPlaceMatchReply();
 
     QPlaceReply::Type type() const;
diff --git a/src/location/places/qplaceproposedsearchresult_p.h b/src/location/places/qplaceproposedsearchresult_p.h
index 46f95106..b0972bec 100644
--- a/src/location/places/qplaceproposedsearchresult_p.h
+++ b/src/location/places/qplaceproposedsearchresult_p.h
@@ -60,7 +60,7 @@ public:
 
     ~QPlaceProposedSearchResultPrivate();
 
-    bool compare(const QPlaceSearchResultPrivate *other) const Q_DECL_OVERRIDE;
+    bool compare(const QPlaceSearchResultPrivate *other) const override;
 
     Q_DEFINE_SEARCHRESULT_PRIVATE_HELPER(QPlaceProposedSearchResult, QPlaceSearchResult::ProposedSearchResult)
 
diff --git a/src/location/places/qplacereply.h b/src/location/places/qplacereply.h
index 3eb3d6cc..8fd34643 100644
--- a/src/location/places/qplacereply.h
+++ b/src/location/places/qplacereply.h
@@ -71,7 +71,7 @@ public:
         MatchReply
     };
 
-    explicit QPlaceReply(QObject *parent = Q_NULLPTR);
+    explicit QPlaceReply(QObject *parent = nullptr);
     ~QPlaceReply();
 
     bool isFinished() const;
@@ -90,7 +90,7 @@ Q_SIGNALS:
     void error(QPlaceReply::Error error, const QString &errorString = QString());
 
 protected:
-    explicit QPlaceReply(QPlaceReplyPrivate *, QObject *parent = Q_NULLPTR);
+    explicit QPlaceReply(QPlaceReplyPrivate *, QObject *parent = nullptr);
     void setFinished(bool finished);
     void setError(QPlaceReply::Error error, const QString &errorString);
     QPlaceReplyPrivate *d_ptr;
diff --git a/src/location/places/qplaceresult_p.h b/src/location/places/qplaceresult_p.h
index 0e0bf8cd..b7f4065f 100644
--- a/src/location/places/qplaceresult_p.h
+++ b/src/location/places/qplaceresult_p.h
@@ -60,7 +60,7 @@ public:
 
     ~QPlaceResultPrivate();
 
-    bool compare(const QPlaceSearchResultPrivate *other) const Q_DECL_OVERRIDE;
+    bool compare(const QPlaceSearchResultPrivate *other) const override;
 
     Q_DEFINE_SEARCHRESULT_PRIVATE_HELPER(QPlaceResult, QPlaceSearchResult::PlaceResult)
 
diff --git a/src/location/places/qplacesearchreply.h b/src/location/places/qplacesearchreply.h
index 52c88899..3562aede 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 = Q_NULLPTR);
+    explicit QPlaceSearchReply(QObject *parent = nullptr);
     ~QPlaceSearchReply();
 
     QPlaceReply::Type type() const;
diff --git a/src/location/places/qplacesearchresult_p.h b/src/location/places/qplacesearchresult_p.h
index e7c1aaf5..3d444694 100644
--- a/src/location/places/qplacesearchresult_p.h
+++ b/src/location/places/qplacesearchresult_p.h
@@ -65,8 +65,8 @@ QT_BEGIN_NAMESPACE
     Class::Class(const QPlaceSearchResult &other) : QPlaceSearchResult() { Class##Private::copyIfPossible(d_ptr, other); }
 
 #define Q_DEFINE_SEARCHRESULT_PRIVATE_HELPER(Class, ResultType) \
-    virtual QPlaceSearchResultPrivate *clone() const Q_DECL_OVERRIDE { return new Class##Private(*this); } \
-    virtual QPlaceSearchResult::SearchResultType type() const Q_DECL_OVERRIDE {return ResultType;} \
+    virtual QPlaceSearchResultPrivate *clone() const override { return new Class##Private(*this); } \
+    virtual QPlaceSearchResult::SearchResultType type() const override {return ResultType;} \
     static void copyIfPossible(QSharedDataPointer<QPlaceSearchResultPrivate> &d_ptr, const QPlaceSearchResult &other) \
     { \
         if (other.type() == ResultType) \
diff --git a/src/location/places/qplacesearchsuggestionreply.h b/src/location/places/qplacesearchsuggestionreply.h
index 3909b14f..49088874 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 = Q_NULLPTR);
+    explicit QPlaceSearchSuggestionReply(QObject *parent = nullptr);
     ~QPlaceSearchSuggestionReply();
 
     QStringList suggestions() const;
diff --git a/src/plugins/geoservices/esri/geocodereply_esri.h b/src/plugins/geoservices/esri/geocodereply_esri.h
index a857599b..76b416ce 100644
--- a/src/plugins/geoservices/esri/geocodereply_esri.h
+++ b/src/plugins/geoservices/esri/geocodereply_esri.h
@@ -57,7 +57,7 @@ public:
     };
 
 public:
-    GeoCodeReplyEsri(QNetworkReply *reply, OperationType operationType, QObject *parent = Q_NULLPTR);
+    GeoCodeReplyEsri(QNetworkReply *reply, OperationType operationType, QObject *parent = nullptr);
     ~GeoCodeReplyEsri();
 
     inline OperationType operationType() const;
diff --git a/src/plugins/geoservices/esri/geocodingmanagerengine_esri.h b/src/plugins/geoservices/esri/geocodingmanagerengine_esri.h
index 9ff246e0..ff7bf882 100644
--- a/src/plugins/geoservices/esri/geocodingmanagerengine_esri.h
+++ b/src/plugins/geoservices/esri/geocodingmanagerengine_esri.h
@@ -57,11 +57,11 @@ public:
                                QString *errorString);
     virtual ~GeoCodingManagerEngineEsri();
 
-    QGeoCodeReply *geocode(const QGeoAddress &address, const QGeoShape &bounds) Q_DECL_OVERRIDE;
+    QGeoCodeReply *geocode(const QGeoAddress &address, const QGeoShape &bounds) override;
     QGeoCodeReply *geocode(const QString &address, int limit, int offset,
-                           const QGeoShape &bounds) Q_DECL_OVERRIDE;
+                           const QGeoShape &bounds) override;
     QGeoCodeReply *reverseGeocode(const QGeoCoordinate &coordinate,
-                                  const QGeoShape &bounds) Q_DECL_OVERRIDE;
+                                  const QGeoShape &bounds) override;
 
 private Q_SLOTS:
     void replyFinished();
diff --git a/src/plugins/geoservices/esri/georoutereply_esri.h b/src/plugins/geoservices/esri/georoutereply_esri.h
index 049dc3ba..960c90de 100644
--- a/src/plugins/geoservices/esri/georoutereply_esri.h
+++ b/src/plugins/geoservices/esri/georoutereply_esri.h
@@ -50,7 +50,7 @@ class GeoRouteReplyEsri : public QGeoRouteReply
     Q_OBJECT
 
 public:
-    GeoRouteReplyEsri(QNetworkReply *reply, const QGeoRouteRequest &request, QObject *parent = Q_NULLPTR);
+    GeoRouteReplyEsri(QNetworkReply *reply, const QGeoRouteRequest &request, QObject *parent = nullptr);
     ~GeoRouteReplyEsri();
 
 private Q_SLOTS:
diff --git a/src/plugins/geoservices/esri/georoutingmanagerengine_esri.h b/src/plugins/geoservices/esri/georoutingmanagerengine_esri.h
index 7387e25c..17aaa3ab 100644
--- a/src/plugins/geoservices/esri/georoutingmanagerengine_esri.h
+++ b/src/plugins/geoservices/esri/georoutingmanagerengine_esri.h
@@ -56,7 +56,7 @@ public:
                                 QString *errorString);
     virtual ~GeoRoutingManagerEngineEsri();
 
-    QGeoRouteReply *calculateRoute(const QGeoRouteRequest &request) Q_DECL_OVERRIDE;
+    QGeoRouteReply *calculateRoute(const QGeoRouteRequest &request) override;
 
 private Q_SLOTS:
     void replyFinished();
diff --git a/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.cpp b/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.cpp
index 5277cde3..0a54e008 100644
--- a/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.cpp
+++ b/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.cpp
@@ -80,7 +80,7 @@ QPlaceManagerEngine *GeoServiceProviderFactoryEsri::createPlaceManagerEngine(
     Q_UNUSED(error)
     Q_UNUSED(errorString)
 
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.h b/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.h
index d198c75a..abd0d59b 100644
--- a/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.h
+++ b/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.h
@@ -55,16 +55,16 @@ class GeoServiceProviderFactoryEsri: public QObject, public QGeoServiceProviderF
 public:
     QGeoCodingManagerEngine *createGeocodingManagerEngine(const QVariantMap &parameters,
                                                           QGeoServiceProvider::Error *error,
-                                                          QString *errorString) const Q_DECL_OVERRIDE;
+                                                          QString *errorString) const override;
     QGeoMappingManagerEngine *createMappingManagerEngine(const QVariantMap &parameters,
                                                          QGeoServiceProvider::Error *error,
-                                                         QString *errorString) const Q_DECL_OVERRIDE;
+                                                         QString *errorString) const override;
     QGeoRoutingManagerEngine *createRoutingManagerEngine(const QVariantMap &parameters,
                                                          QGeoServiceProvider::Error *error,
-                                                         QString *errorString) const Q_DECL_OVERRIDE;
+                                                         QString *errorString) const override;
     QPlaceManagerEngine *createPlaceManagerEngine(const QVariantMap &parameters,
                                                   QGeoServiceProvider::Error *error,
-                                                  QString *errorString) const Q_DECL_OVERRIDE;
+                                                  QString *errorString) const override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/esri/geotiledmap_esri.h b/src/plugins/geoservices/esri/geotiledmap_esri.h
index d9d9d0b7..e8b26152 100644
--- a/src/plugins/geoservices/esri/geotiledmap_esri.h
+++ b/src/plugins/geoservices/esri/geotiledmap_esri.h
@@ -51,11 +51,11 @@ class GeoTiledMapEsri: public QGeoTiledMap
     Q_OBJECT
 
 public:
-    explicit GeoTiledMapEsri(GeoTiledMappingManagerEngineEsri *engine, QObject *parent = Q_NULLPTR);
+    explicit GeoTiledMapEsri(GeoTiledMappingManagerEngineEsri *engine, QObject *parent = nullptr);
     virtual ~GeoTiledMapEsri();
 
 protected:
-    void evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles) Q_DECL_OVERRIDE;
+    void evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles) override;
 
     inline GeoTiledMappingManagerEngineEsri *engine() const;
 
diff --git a/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp b/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp
index ac8f8450..3fa9a177 100644
--- a/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp
+++ b/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp
@@ -298,7 +298,7 @@ GeoMapSource *GeoTiledMappingManagerEngineEsri::mapSource(int mapId) const
             return mapSource;
     }
 
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.h b/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.h
index ea0c3c8b..63172389 100644
--- a/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.h
+++ b/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.h
@@ -57,7 +57,7 @@ public:
                                      QGeoServiceProvider::Error *error, QString *errorString);
     virtual ~GeoTiledMappingManagerEngineEsri();
 
-    QGeoMap *createMap() Q_DECL_OVERRIDE;
+    QGeoMap *createMap() override;
 
     inline const QList<GeoMapSource *>& mapSources() const;
     GeoMapSource *mapSource(int mapId) const;
diff --git a/src/plugins/geoservices/esri/geotiledmapreply_esri.h b/src/plugins/geoservices/esri/geotiledmapreply_esri.h
index b459e943..572431dd 100644
--- a/src/plugins/geoservices/esri/geotiledmapreply_esri.h
+++ b/src/plugins/geoservices/esri/geotiledmapreply_esri.h
@@ -51,7 +51,7 @@ class GeoTiledMapReplyEsri : public QGeoTiledMapReply
     Q_OBJECT
 
 public:
-    GeoTiledMapReplyEsri(QNetworkReply *reply, const QGeoTileSpec &spec, QObject *parent = Q_NULLPTR);
+    GeoTiledMapReplyEsri(QNetworkReply *reply, const QGeoTileSpec &spec, QObject *parent = nullptr);
     ~GeoTiledMapReplyEsri();
 
 private Q_SLOTS:
diff --git a/src/plugins/geoservices/esri/geotilefetcher_esri.h b/src/plugins/geoservices/esri/geotilefetcher_esri.h
index be948af1..5702d1c4 100644
--- a/src/plugins/geoservices/esri/geotilefetcher_esri.h
+++ b/src/plugins/geoservices/esri/geotilefetcher_esri.h
@@ -61,7 +61,7 @@ public:
     inline void setToken(const QString &token);
 
 private:
-    QGeoTiledMapReply *getTileImage(const QGeoTileSpec &spec) Q_DECL_OVERRIDE;
+    QGeoTiledMapReply *getTileImage(const QGeoTileSpec &spec) override;
 
     QNetworkAccessManager *m_networkManager;
     QByteArray m_userAgent;
diff --git a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp
index 8d5edc6d..29b84408 100644
--- a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp
+++ b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp
@@ -50,9 +50,9 @@ public:
     virtual ~QGeoMapItemsOverlayPrivate();
 
 protected:
-    void changeViewportSize(const QSize &size) Q_DECL_OVERRIDE;
-    void changeCameraData(const QGeoCameraData &oldCameraData) Q_DECL_OVERRIDE;
-    void changeActiveMapType(const QGeoMapType mapType) Q_DECL_OVERRIDE;
+    void changeViewportSize(const QSize &size) override;
+    void changeCameraData(const QGeoCameraData &oldCameraData) override;
+    void changeActiveMapType(const QGeoMapType mapType) override;
 };
 
 QGeoMapItemsOverlay::QGeoMapItemsOverlay(QGeoMappingManagerEngineItemsOverlay *engine, QObject *parent)
diff --git a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.h b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.h
index bd53a693..47249240 100644
--- a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.h
+++ b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.h
@@ -54,7 +54,7 @@ public:
 
     virtual ~QGeoMapItemsOverlay();
 protected:
-    QSGNode *updateSceneGraph(QSGNode *node, QQuickWindow *window) Q_DECL_OVERRIDE;
+    QSGNode *updateSceneGraph(QSGNode *node, QQuickWindow *window) override;
 
 private:
     Q_DISABLE_COPY(QGeoMapItemsOverlay)
diff --git a/src/plugins/geoservices/itemsoverlay/qgeomappingmanagerengineitemsoverlay.h b/src/plugins/geoservices/itemsoverlay/qgeomappingmanagerengineitemsoverlay.h
index 892bf59c..02bc3001 100644
--- a/src/plugins/geoservices/itemsoverlay/qgeomappingmanagerengineitemsoverlay.h
+++ b/src/plugins/geoservices/itemsoverlay/qgeomappingmanagerengineitemsoverlay.h
@@ -51,7 +51,7 @@ public:
                                         QGeoServiceProvider::Error *error, QString *errorString);
     ~QGeoMappingManagerEngineItemsOverlay();
 
-    QGeoMap *createMap() Q_DECL_OVERRIDE;
+    QGeoMap *createMap() override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/mapbox/qgeocodingmanagerenginemapbox.h b/src/plugins/geoservices/mapbox/qgeocodingmanagerenginemapbox.h
index 614151f5..e0913453 100644
--- a/src/plugins/geoservices/mapbox/qgeocodingmanagerenginemapbox.h
+++ b/src/plugins/geoservices/mapbox/qgeocodingmanagerenginemapbox.h
@@ -58,11 +58,11 @@ public:
                                QString *errorString);
     ~QGeoCodingManagerEngineMapbox();
 
-    QGeoCodeReply *geocode(const QGeoAddress &address, const QGeoShape &bounds) Q_DECL_OVERRIDE;
+    QGeoCodeReply *geocode(const QGeoAddress &address, const QGeoShape &bounds) override;
     QGeoCodeReply *geocode(const QString &address, int limit, int offset,
-                           const QGeoShape &bounds) Q_DECL_OVERRIDE;
+                           const QGeoShape &bounds) override;
     QGeoCodeReply *reverseGeocode(const QGeoCoordinate &coordinate,
-                                  const QGeoShape &bounds) Q_DECL_OVERRIDE;
+                                  const QGeoShape &bounds) override;
 
 private slots:
     void onReplyFinished();
diff --git a/src/plugins/geoservices/mapbox/qgeofiletilecachemapbox.h b/src/plugins/geoservices/mapbox/qgeofiletilecachemapbox.h
index faf9b2bf..30a10bdc 100644
--- a/src/plugins/geoservices/mapbox/qgeofiletilecachemapbox.h
+++ b/src/plugins/geoservices/mapbox/qgeofiletilecachemapbox.h
@@ -50,8 +50,8 @@ public:
     ~QGeoFileTileCacheMapbox();
 
 protected:
-    QString tileSpecToFilename(const QGeoTileSpec &spec, const QString &format, const QString &directory) const Q_DECL_OVERRIDE;
-    QGeoTileSpec filenameToTileSpec(const QString &filename) const Q_DECL_OVERRIDE;
+    QString tileSpecToFilename(const QGeoTileSpec &spec, const QString &format, const QString &directory) const override;
+    QGeoTileSpec filenameToTileSpec(const QString &filename) const override;
 
     QList<QGeoMapType> m_mapTypes;
     QMap<QString, int> m_mapNameToId;
diff --git a/src/plugins/geoservices/mapbox/qplacemanagerenginemapbox.h b/src/plugins/geoservices/mapbox/qplacemanagerenginemapbox.h
index 1c5bda5b..120fab74 100644
--- a/src/plugins/geoservices/mapbox/qplacemanagerenginemapbox.h
+++ b/src/plugins/geoservices/mapbox/qplacemanagerenginemapbox.h
@@ -56,24 +56,24 @@ public:
                            QString *errorString);
     ~QPlaceManagerEngineMapbox();
 
-    QPlaceSearchReply *search(const QPlaceSearchRequest &) Q_DECL_OVERRIDE;
+    QPlaceSearchReply *search(const QPlaceSearchRequest &) override;
 
-    QPlaceSearchSuggestionReply *searchSuggestions(const QPlaceSearchRequest &) Q_DECL_OVERRIDE;
+    QPlaceSearchSuggestionReply *searchSuggestions(const QPlaceSearchRequest &) override;
 
-    QPlaceReply *initializeCategories() Q_DECL_OVERRIDE;
-    QString parentCategoryId(const QString &categoryId) const Q_DECL_OVERRIDE;
-    QStringList childCategoryIds(const QString &categoryId) const Q_DECL_OVERRIDE;
-    QPlaceCategory category(const QString &categoryId) const Q_DECL_OVERRIDE;
-    QList<QPlaceCategory> childCategories(const QString &parentId) const Q_DECL_OVERRIDE;
+    QPlaceReply *initializeCategories() override;
+    QString parentCategoryId(const QString &categoryId) const override;
+    QStringList childCategoryIds(const QString &categoryId) const override;
+    QPlaceCategory category(const QString &categoryId) const override;
+    QList<QPlaceCategory> childCategories(const QString &parentId) const override;
 
-    QList<QLocale> locales() const Q_DECL_OVERRIDE;
-    void setLocales(const QList<QLocale> &locales) Q_DECL_OVERRIDE;
+    QList<QLocale> locales() const override;
+    void setLocales(const QList<QLocale> &locales) override;
 
     // TODO: icon
     //QPlaceIcon icon(const QString &remotePath,
     //                const QList<QPlaceCategory> &categories = QList<QPlaceCategory>()) const;
 
-    //QUrl constructIconUrl(const QPlaceIcon &icon, const QSize &size) const Q_DECL_OVERRIDE;
+    //QUrl constructIconUrl(const QPlaceIcon &icon, const QSize &size) const override;
 
 private slots:
     void onReplyFinished();
diff --git a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.h b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.h
index df76fcab..0ffaf4ea 100644
--- a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.h
+++ b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.h
@@ -53,7 +53,7 @@ public:
     QGeoMapMapboxGL(QGeoMappingManagerEngineMapboxGL *engine, QObject *parent);
     virtual ~QGeoMapMapboxGL();
 
-    QString copyrightsStyleSheet() const Q_DECL_OVERRIDE;
+    QString copyrightsStyleSheet() const override;
     void setMapboxGLSettings(const QMapboxGLSettings &);
     void setUseFBO(bool);
     void setMapItemsBefore(const QString &);
@@ -76,7 +76,7 @@ public Q_SLOTS:
     void copyrightsChanged(const QString &copyrightsHtml);
 
 private:
-    QSGNode *updateSceneGraph(QSGNode *oldNode, QQuickWindow *window) Q_DECL_OVERRIDE;
+    QSGNode *updateSceneGraph(QSGNode *oldNode, QQuickWindow *window) override;
 
     QGeoMappingManagerEngineMapboxGL *m_engine;
 };
diff --git a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl_p.h b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl_p.h
index 598c9078..ffb06208 100644
--- a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl_p.h
+++ b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl_p.h
@@ -60,12 +60,12 @@ public:
 
     QSGNode *updateSceneGraph(QSGNode *oldNode, QQuickWindow *window);
 
-    void addParameter(QGeoMapParameter *param) Q_DECL_OVERRIDE;
-    void removeParameter(QGeoMapParameter *param) Q_DECL_OVERRIDE;
+    void addParameter(QGeoMapParameter *param) override;
+    void removeParameter(QGeoMapParameter *param) override;
 
-    QGeoMap::ItemTypes supportedMapItemTypes() const Q_DECL_OVERRIDE;
-    void addMapItem(QDeclarativeGeoMapItemBase *item) Q_DECL_OVERRIDE;
-    void removeMapItem(QDeclarativeGeoMapItemBase *item) Q_DECL_OVERRIDE;
+    QGeoMap::ItemTypes supportedMapItemTypes() const override;
+    void addMapItem(QDeclarativeGeoMapItemBase *item) override;
+    void removeMapItem(QDeclarativeGeoMapItemBase *item) override;
 
     /* Data members */
     enum SyncState : int {
@@ -92,9 +92,9 @@ public:
     QList<QSharedPointer<QMapboxGLStyleChange>> m_styleChanges;
 
 protected:
-    void changeViewportSize(const QSize &size) Q_DECL_OVERRIDE;
-    void changeCameraData(const QGeoCameraData &oldCameraData) Q_DECL_OVERRIDE;
-    void changeActiveMapType(const QGeoMapType mapType) Q_DECL_OVERRIDE;
+    void changeViewportSize(const QSize &size) override;
+    void changeCameraData(const QGeoCameraData &oldCameraData) override;
+    void changeActiveMapType(const QGeoMapType mapType) override;
 
 private:
     Q_DISABLE_COPY(QGeoMapMapboxGLPrivate);
diff --git a/src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.h b/src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.h
index 44096e60..b3afe77b 100644
--- a/src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.h
+++ b/src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.h
@@ -54,7 +54,7 @@ public:
                                         QGeoServiceProvider::Error *error, QString *errorString);
     ~QGeoMappingManagerEngineMapboxGL();
 
-    QGeoMap *createMap() Q_DECL_OVERRIDE;
+    QGeoMap *createMap() override;
 
 private:
     QMapboxGLSettings m_settings;
diff --git a/src/plugins/geoservices/mapboxgl/qmapboxglstylechange_p.h b/src/plugins/geoservices/mapboxgl/qmapboxglstylechange_p.h
index 33737c1d..fd5b9af4 100644
--- a/src/plugins/geoservices/mapboxgl/qmapboxglstylechange_p.h
+++ b/src/plugins/geoservices/mapboxgl/qmapboxglstylechange_p.h
@@ -70,7 +70,7 @@ public:
     static QList<QSharedPointer<QMapboxGLStyleChange>> fromMapParameter(QGeoMapParameter *);
     static QList<QSharedPointer<QMapboxGLStyleChange>> fromMapItem(QDeclarativeGeoMapItemBase *);
 
-    void apply(QMapboxGL *map) Q_DECL_OVERRIDE;
+    void apply(QMapboxGL *map) override;
 
 private:
     static QList<QSharedPointer<QMapboxGLStyleChange>> fromMapItem(QDeclarativePolylineMapItem *);
@@ -89,7 +89,7 @@ public:
     static QList<QSharedPointer<QMapboxGLStyleChange>> fromMapParameter(QGeoMapParameter *);
     static QList<QSharedPointer<QMapboxGLStyleChange>> fromMapItem(QDeclarativeGeoMapItemBase *);
 
-    void apply(QMapboxGL *map) Q_DECL_OVERRIDE;
+    void apply(QMapboxGL *map) override;
 
 private:
     static QList<QSharedPointer<QMapboxGLStyleChange>> fromMapItem(QDeclarativeRectangleMapItem *);
@@ -111,7 +111,7 @@ public:
     static QSharedPointer<QMapboxGLStyleChange> fromMapParameter(QGeoMapParameter *);
     static QSharedPointer<QMapboxGLStyleChange> fromFeature(const QMapbox::Feature &feature, const QString &before);
 
-    void apply(QMapboxGL *map) Q_DECL_OVERRIDE;
+    void apply(QMapboxGL *map) override;
 
 private:
     QMapboxGLStyleAddLayer() = default;
@@ -125,7 +125,7 @@ class QMapboxGLStyleRemoveLayer : public QMapboxGLStyleChange
 public:
     explicit QMapboxGLStyleRemoveLayer(const QString &id);
 
-    void apply(QMapboxGL *map) Q_DECL_OVERRIDE;
+    void apply(QMapboxGL *map) override;
 
 private:
     QMapboxGLStyleRemoveLayer() = default;
@@ -140,7 +140,7 @@ public:
     static QSharedPointer<QMapboxGLStyleChange> fromFeature(const QMapbox::Feature &feature);
     static QSharedPointer<QMapboxGLStyleChange> fromMapItem(QDeclarativeGeoMapItemBase *);
 
-    void apply(QMapboxGL *map) Q_DECL_OVERRIDE;
+    void apply(QMapboxGL *map) override;
 
 private:
     QMapboxGLStyleAddSource() = default;
@@ -154,7 +154,7 @@ class QMapboxGLStyleRemoveSource : public QMapboxGLStyleChange
 public:
     explicit QMapboxGLStyleRemoveSource(const QString &id);
 
-    void apply(QMapboxGL *map) Q_DECL_OVERRIDE;
+    void apply(QMapboxGL *map) override;
 
 private:
     QMapboxGLStyleRemoveSource() = default;
@@ -167,7 +167,7 @@ class QMapboxGLStyleSetFilter : public QMapboxGLStyleChange
 public:
     static QSharedPointer<QMapboxGLStyleChange> fromMapParameter(QGeoMapParameter *);
 
-    void apply(QMapboxGL *map) Q_DECL_OVERRIDE;
+    void apply(QMapboxGL *map) override;
 
 private:
     QMapboxGLStyleSetFilter() = default;
@@ -181,7 +181,7 @@ class QMapboxGLStyleAddImage : public QMapboxGLStyleChange
 public:
     static QSharedPointer<QMapboxGLStyleChange> fromMapParameter(QGeoMapParameter *);
 
-    void apply(QMapboxGL *map) Q_DECL_OVERRIDE;
+    void apply(QMapboxGL *map) override;
 
 private:
     QMapboxGLStyleAddImage() = default;
diff --git a/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h b/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h
index 5805a76c..f89ee143 100644
--- a/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h
+++ b/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h
@@ -71,8 +71,8 @@ public:
     QMapboxGL* map() const;
 
     // QSGRenderNode
-    void render(const RenderState *state) Q_DECL_OVERRIDE;
-    StateFlags changedStates() const Q_DECL_OVERRIDE;
+    void render(const RenderState *state) override;
+    StateFlags changedStates() const override;
 
 private:
     QScopedPointer<QMapboxGL> m_map;
diff --git a/src/plugins/geoservices/nokia/qgeofiletilecachenokia.h b/src/plugins/geoservices/nokia/qgeofiletilecachenokia.h
index aba232f5..4dcd445b 100644
--- a/src/plugins/geoservices/nokia/qgeofiletilecachenokia.h
+++ b/src/plugins/geoservices/nokia/qgeofiletilecachenokia.h
@@ -49,8 +49,8 @@ public:
     ~QGeoFileTileCacheNokia();
 
 protected:
-    virtual QString tileSpecToFilename(const QGeoTileSpec &spec, const QString &format, const QString &directory) const Q_DECL_OVERRIDE;
-    virtual QGeoTileSpec filenameToTileSpec(const QString &filename) const Q_DECL_OVERRIDE;
+    virtual QString tileSpecToFilename(const QGeoTileSpec &spec, const QString &format, const QString &directory) const override;
+    virtual QGeoTileSpec filenameToTileSpec(const QString &filename) const override;
 
     QString m_ppi;
 };
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
index fe2e537e..cd632958 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
@@ -71,33 +71,33 @@ public:
                                QString *errorString);
     ~QPlaceManagerEngineNokiaV2();
 
-    QPlaceDetailsReply *getPlaceDetails(const QString &placeId) Q_DECL_OVERRIDE;
+    QPlaceDetailsReply *getPlaceDetails(const QString &placeId) override;
 
-    QPlaceContentReply *getPlaceContent(const QPlaceContentRequest &request) Q_DECL_OVERRIDE;
+    QPlaceContentReply *getPlaceContent(const QPlaceContentRequest &request) override;
 
-    QPlaceSearchReply *search(const QPlaceSearchRequest &query) Q_DECL_OVERRIDE;
+    QPlaceSearchReply *search(const QPlaceSearchRequest &query) override;
 
-    QPlaceSearchSuggestionReply *searchSuggestions(const QPlaceSearchRequest &query) Q_DECL_OVERRIDE;
+    QPlaceSearchSuggestionReply *searchSuggestions(const QPlaceSearchRequest &query) override;
 
-    QPlaceIdReply *savePlace(const QPlace &place) Q_DECL_OVERRIDE;
-    QPlaceIdReply *removePlace(const QString &placeId) Q_DECL_OVERRIDE;
+    QPlaceIdReply *savePlace(const QPlace &place) override;
+    QPlaceIdReply *removePlace(const QString &placeId) override;
 
-    QPlaceIdReply *saveCategory(const QPlaceCategory &category, const QString &parentId) Q_DECL_OVERRIDE;
-    QPlaceIdReply *removeCategory(const QString &categoryId) Q_DECL_OVERRIDE;
+    QPlaceIdReply *saveCategory(const QPlaceCategory &category, const QString &parentId) override;
+    QPlaceIdReply *removeCategory(const QString &categoryId) override;
 
-    QPlaceReply *initializeCategories() Q_DECL_OVERRIDE;
-    QString parentCategoryId(const QString &categoryId) const Q_DECL_OVERRIDE;
-    QStringList childCategoryIds(const QString &categoryId) const Q_DECL_OVERRIDE;
-    QPlaceCategory category(const QString &categoryId) const Q_DECL_OVERRIDE;
-    QList<QPlaceCategory> childCategories(const QString &parentId) const Q_DECL_OVERRIDE;
+    QPlaceReply *initializeCategories() override;
+    QString parentCategoryId(const QString &categoryId) const override;
+    QStringList childCategoryIds(const QString &categoryId) const override;
+    QPlaceCategory category(const QString &categoryId) const override;
+    QList<QPlaceCategory> childCategories(const QString &parentId) const override;
 
-    QList<QLocale> locales() const Q_DECL_OVERRIDE;
-    void setLocales(const QList<QLocale> &locales) Q_DECL_OVERRIDE;
+    QList<QLocale> locales() const override;
+    void setLocales(const QList<QLocale> &locales) override;
 
     QPlaceIcon icon(const QString &remotePath,
                     const QList<QPlaceCategory> &categories = QList<QPlaceCategory>()) const;
 
-    QUrl constructIconUrl(const QPlaceIcon &icon, const QSize &size) const Q_DECL_OVERRIDE;
+    QUrl constructIconUrl(const QPlaceIcon &icon, const QSize &size) const override;
 
 private:
     QNetworkReply *sendRequest(const QUrl &url);
diff --git a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.h b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.h
index 4eea2cde..0fec49de 100644
--- a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.h
+++ b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.h
@@ -57,11 +57,11 @@ public:
                                QString *errorString);
     ~QGeoCodingManagerEngineOsm();
 
-    QGeoCodeReply *geocode(const QGeoAddress &address, const QGeoShape &bounds) Q_DECL_OVERRIDE;
+    QGeoCodeReply *geocode(const QGeoAddress &address, const QGeoShape &bounds) override;
     QGeoCodeReply *geocode(const QString &address, int limit, int offset,
-                           const QGeoShape &bounds) Q_DECL_OVERRIDE;
+                           const QGeoShape &bounds) override;
     QGeoCodeReply *reverseGeocode(const QGeoCoordinate &coordinate,
-                                  const QGeoShape &bounds) Q_DECL_OVERRIDE;
+                                  const QGeoShape &bounds) override;
 
 private Q_SLOTS:
     void replyFinished();
diff --git a/src/plugins/geoservices/osm/qgeofiletilecacheosm.h b/src/plugins/geoservices/osm/qgeofiletilecacheosm.h
index f26e7f10..5f11004c 100644
--- a/src/plugins/geoservices/osm/qgeofiletilecacheosm.h
+++ b/src/plugins/geoservices/osm/qgeofiletilecacheosm.h
@@ -55,7 +55,7 @@ public:
                          QObject *parent = 0);
     ~QGeoFileTileCacheOsm();
 
-    QSharedPointer<QGeoTileTexture> get(const QGeoTileSpec &spec) Q_DECL_OVERRIDE;
+    QSharedPointer<QGeoTileTexture> get(const QGeoTileSpec &spec) override;
 
 Q_SIGNALS:
     void mapDataUpdated(int mapId);
@@ -65,9 +65,9 @@ protected Q_SLOTS:
     void onProviderResolutionError(const QGeoTileProviderOsm *provider, QNetworkReply::NetworkError error);
 
 protected:
-    void init() Q_DECL_OVERRIDE;
-    QString tileSpecToFilename(const QGeoTileSpec &spec, const QString &format, const QString &directory) const Q_DECL_OVERRIDE;
-    QGeoTileSpec filenameToTileSpec(const QString &filename) const Q_DECL_OVERRIDE;
+    void init() override;
+    QString tileSpecToFilename(const QGeoTileSpec &spec, const QString &format, const QString &directory) const override;
+    QGeoTileSpec filenameToTileSpec(const QString &filename) const override;
     QSharedPointer<QGeoTileTexture> getFromOfflineStorage(const QGeoTileSpec &spec);
     void dropTiles(int mapId);
     void loadTiles(int mapId);
diff --git a/src/plugins/geoservices/osm/qgeotiledmaposm.h b/src/plugins/geoservices/osm/qgeotiledmaposm.h
index cfc72948..b2af5d89 100644
--- a/src/plugins/geoservices/osm/qgeotiledmaposm.h
+++ b/src/plugins/geoservices/osm/qgeotiledmaposm.h
@@ -56,7 +56,7 @@ public:
     ~QGeoTiledMapOsm();
 
 protected:
-    void evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles) Q_DECL_OVERRIDE;
+    void evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles) override;
 
 protected Q_SLOTS:
     void onProviderDataUpdated(const QGeoTileProviderOsm *provider);
diff --git a/src/plugins/geoservices/osm/qgeotilefetcherosm.cpp b/src/plugins/geoservices/osm/qgeotilefetcherosm.cpp
index 8c5778d1..135654a9 100644
--- a/src/plugins/geoservices/osm/qgeotilefetcherosm.cpp
+++ b/src/plugins/geoservices/osm/qgeotilefetcherosm.cpp
@@ -146,14 +146,14 @@ QGeoTiledMapReply *QGeoTileFetcherOsm::getTileImage(const QGeoTileSpec &spec)
     if (id < 1 || id > m_providers.size()) {
         qWarning("Unknown map id %d\n", spec.mapId());
         if (m_providers.isEmpty())
-            return Q_NULLPTR;
+            return nullptr;
         else
             id = 1;
     }
     id -= 1; // TODO: make OSM map ids start from 0.
 
     if (spec.zoom() > m_providers[id]->maximumZoomLevel() || spec.zoom() < m_providers[id]->minimumZoomLevel())
-        return Q_NULLPTR;
+        return nullptr;
 
     const QUrl url = m_providers[id]->tileAddress(spec.x(), spec.y(), spec.zoom());
     QNetworkRequest request;
diff --git a/src/plugins/geoservices/osm/qgeotilefetcherosm.h b/src/plugins/geoservices/osm/qgeotilefetcherosm.h
index 859033cc..682ff689 100644
--- a/src/plugins/geoservices/osm/qgeotilefetcherosm.h
+++ b/src/plugins/geoservices/osm/qgeotilefetcherosm.h
@@ -67,7 +67,7 @@ Q_SIGNALS:
     void providerDataUpdated(const QGeoTileProviderOsm *provider);
 
 protected:
-    bool initialized() const Q_DECL_OVERRIDE;
+    bool initialized() const override;
 
 protected Q_SLOTS:
     void onProviderResolutionFinished(const QGeoTileProviderOsm *provider);
@@ -75,7 +75,7 @@ protected Q_SLOTS:
     void restartTimer();
 
 private:
-    QGeoTiledMapReply *getTileImage(const QGeoTileSpec &spec) Q_DECL_OVERRIDE;
+    QGeoTiledMapReply *getTileImage(const QGeoTileSpec &spec) override;
     void readyUpdated();
 
     QByteArray m_userAgent;
diff --git a/src/plugins/geoservices/osm/qplacemanagerengineosm.h b/src/plugins/geoservices/osm/qplacemanagerengineosm.h
index 76898dad..77580226 100644
--- a/src/plugins/geoservices/osm/qplacemanagerengineosm.h
+++ b/src/plugins/geoservices/osm/qplacemanagerengineosm.h
@@ -58,17 +58,17 @@ public:
                            QString *errorString);
     ~QPlaceManagerEngineOsm();
 
-    QPlaceSearchReply *search(const QPlaceSearchRequest &request) Q_DECL_OVERRIDE;
+    QPlaceSearchReply *search(const QPlaceSearchRequest &request) override;
 
-    QPlaceReply *initializeCategories() Q_DECL_OVERRIDE;
-    QString parentCategoryId(const QString &categoryId) const Q_DECL_OVERRIDE;
-    QStringList childCategoryIds(const QString &categoryId) const Q_DECL_OVERRIDE;
-    QPlaceCategory category(const QString &categoryId) const Q_DECL_OVERRIDE;
+    QPlaceReply *initializeCategories() override;
+    QString parentCategoryId(const QString &categoryId) const override;
+    QStringList childCategoryIds(const QString &categoryId) const override;
+    QPlaceCategory category(const QString &categoryId) const override;
 
-    QList<QPlaceCategory> childCategories(const QString &parentId) const Q_DECL_OVERRIDE;
+    QList<QPlaceCategory> childCategories(const QString &parentId) const override;
 
-    QList<QLocale> locales() const Q_DECL_OVERRIDE;
-    void setLocales(const QList<QLocale> &locales) Q_DECL_OVERRIDE;
+    QList<QLocale> locales() const override;
+    void setLocales(const QList<QLocale> &locales) override;
 
 private slots:
     void categoryReplyFinished();
diff --git a/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.h b/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.h
index 6125cb42..d27721da 100644
--- a/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.h
+++ b/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.h
@@ -60,9 +60,9 @@ class QGeoPositionInfoSourceFactoryGeoclue : public QObject, public QGeoPosition
     Q_INTERFACES(QGeoPositionInfoSourceFactory)
 
 public:
-    QGeoPositionInfoSource *positionInfoSource(QObject *parent) Q_DECL_OVERRIDE;
-    QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent) Q_DECL_OVERRIDE;
-    QGeoAreaMonitorSource *areaMonitor(QObject *parent) Q_DECL_OVERRIDE;
+    QGeoPositionInfoSource *positionInfoSource(QObject *parent) override;
+    QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent) override;
+    QGeoAreaMonitorSource *areaMonitor(QObject *parent) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.h b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.h
index 45a0ed79..254a17ac 100644
--- a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.h
+++ b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.h
@@ -61,14 +61,14 @@ public:
     explicit QGeoSatelliteInfoSourceGeoclueMaster(QObject *parent = 0);
     ~QGeoSatelliteInfoSourceGeoclueMaster();
 
-    int minimumUpdateInterval() const Q_DECL_OVERRIDE;
-    void setUpdateInterval(int msec) Q_DECL_OVERRIDE;
+    int minimumUpdateInterval() const override;
+    void setUpdateInterval(int msec) override;
 
-    Error error() const Q_DECL_OVERRIDE;
+    Error error() const override;
 
-    void startUpdates() Q_DECL_OVERRIDE;
-    void stopUpdates() Q_DECL_OVERRIDE;
-    void requestUpdate(int timeout = 0) Q_DECL_OVERRIDE;
+    void startUpdates() override;
+    void stopUpdates() override;
+    void requestUpdate(int timeout = 0) override;
 
 private slots:
     void positionProviderChanged(const QString &name, const QString &description,
diff --git a/src/plugins/position/positionpoll/qgeoareamonitor_polling.h b/src/plugins/position/positionpoll/qgeoareamonitor_polling.h
index c40d424b..11161869 100644
--- a/src/plugins/position/positionpoll/qgeoareamonitor_polling.h
+++ b/src/plugins/position/positionpoll/qgeoareamonitor_polling.h
@@ -57,20 +57,20 @@ public :
     explicit QGeoAreaMonitorPolling(QObject *parent = 0);
     ~QGeoAreaMonitorPolling();
 
-    void setPositionInfoSource(QGeoPositionInfoSource *source) Q_DECL_OVERRIDE;
-    QGeoPositionInfoSource* positionInfoSource() const Q_DECL_OVERRIDE;
+    void setPositionInfoSource(QGeoPositionInfoSource *source) override;
+    QGeoPositionInfoSource* positionInfoSource() const override;
 
-    Error error() const Q_DECL_OVERRIDE;
+    Error error() const override;
 
-    bool startMonitoring(const QGeoAreaMonitorInfo &monitor) Q_DECL_OVERRIDE;
+    bool startMonitoring(const QGeoAreaMonitorInfo &monitor) override;
     bool requestUpdate(const QGeoAreaMonitorInfo &monitor,
-                       const char *signal) Q_DECL_OVERRIDE;
-    bool stopMonitoring(const QGeoAreaMonitorInfo &monitor) Q_DECL_OVERRIDE;
+                       const char *signal) override;
+    bool stopMonitoring(const QGeoAreaMonitorInfo &monitor) override;
 
-    QList<QGeoAreaMonitorInfo> activeMonitors() const Q_DECL_OVERRIDE;
-    QList<QGeoAreaMonitorInfo> activeMonitors(const QGeoShape &region) const Q_DECL_OVERRIDE;
+    QList<QGeoAreaMonitorInfo> activeMonitors() const override;
+    QList<QGeoAreaMonitorInfo> activeMonitors(const QGeoShape &region) const override;
 
-    QGeoAreaMonitorSource::AreaMonitorFeatures supportedAreaMonitorFeatures() const Q_DECL_OVERRIDE;
+    QGeoAreaMonitorSource::AreaMonitorFeatures supportedAreaMonitorFeatures() const override;
 
     inline bool isValid() { return positionInfoSource(); }
 
@@ -85,8 +85,8 @@ private:
     QGeoAreaMonitorPollingPrivate* d;
     QGeoAreaMonitorSource::Error lastError;
 
-    void connectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE;
-    void disconnectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE;
+    void connectNotify(const QMetaMethod &signal) override;
+    void disconnectNotify(const QMetaMethod &signal) override;
 
     int idForSignal(const char *signal);
 };
diff --git a/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.cpp b/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.cpp
index 1d1a6f4f..58092ea3 100644
--- a/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.cpp
+++ b/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.cpp
@@ -111,17 +111,17 @@ NmeaSource::NmeaSource(QObject *parent)
 QGeoPositionInfoSource *QGeoPositionInfoSourceFactorySerialNmea::positionInfoSource(QObject *parent)
 {
     QScopedPointer<NmeaSource> src(new NmeaSource(parent));
-    return src->isValid() ? src.take() : Q_NULLPTR;
+    return src->isValid() ? src.take() : nullptr;
 }
 
 QGeoSatelliteInfoSource *QGeoPositionInfoSourceFactorySerialNmea::satelliteInfoSource(QObject *parent)
 {
     Q_UNUSED(parent);
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 QGeoAreaMonitorSource *QGeoPositionInfoSourceFactorySerialNmea::areaMonitor(QObject *parent)
 {
     Q_UNUSED(parent);
-    return Q_NULLPTR;
+    return nullptr;
 }
diff --git a/src/positioning/qdoublematrix4x4_p.h b/src/positioning/qdoublematrix4x4_p.h
index 77b3e5b9..aaa0b27b 100644
--- a/src/positioning/qdoublematrix4x4_p.h
+++ b/src/positioning/qdoublematrix4x4_p.h
@@ -89,7 +89,7 @@ public:
     inline void fill(double value);
 
     double determinant() const;
-    QDoubleMatrix4x4 inverted(bool *invertible = Q_NULLPTR) const;
+    QDoubleMatrix4x4 inverted(bool *invertible = nullptr) const;
     QDoubleMatrix4x4 transposed() const;
 
     inline QDoubleMatrix4x4& operator+=(const QDoubleMatrix4x4& other);
diff --git a/src/positioning/qgeocircle_p.h b/src/positioning/qgeocircle_p.h
index 07d79db4..ca3f86e2 100644
--- a/src/positioning/qgeocircle_p.h
+++ b/src/positioning/qgeocircle_p.h
@@ -64,13 +64,13 @@ public:
     QGeoCirclePrivate(const QGeoCirclePrivate &other);
     ~QGeoCirclePrivate();
 
-    bool isValid() const Q_DECL_OVERRIDE;
-    bool isEmpty() const Q_DECL_OVERRIDE;
-    bool contains(const QGeoCoordinate &coordinate) const Q_DECL_OVERRIDE;
+    bool isValid() const override;
+    bool isEmpty() const override;
+    bool contains(const QGeoCoordinate &coordinate) const override;
 
-    QGeoCoordinate center() const Q_DECL_OVERRIDE;
+    QGeoCoordinate center() const override;
 
-    QGeoRectangle boundingGeoRectangle() const Q_DECL_OVERRIDE;
+    QGeoRectangle boundingGeoRectangle() const override;
 
     bool crossNorthPole() const;
     bool crossSouthPole() const;
@@ -78,11 +78,11 @@ public:
     void setCenter(const QGeoCoordinate &c);
     void setRadius(const qreal r);
 
-    void extendShape(const QGeoCoordinate &coordinate) Q_DECL_OVERRIDE;
+    void extendShape(const QGeoCoordinate &coordinate) override;
 
-    QGeoShapePrivate *clone() const Q_DECL_OVERRIDE;
+    QGeoShapePrivate *clone() const override;
 
-    bool operator==(const QGeoShapePrivate &other) const Q_DECL_OVERRIDE;
+    bool operator==(const QGeoShapePrivate &other) const override;
 
     QGeoCoordinate m_center;
     qreal m_radius;
diff --git a/src/positioning/qgeopath_p.h b/src/positioning/qgeopath_p.h
index 3eceff24..ecba2dcc 100644
--- a/src/positioning/qgeopath_p.h
+++ b/src/positioning/qgeopath_p.h
@@ -68,20 +68,20 @@ public:
     QGeoPathPrivate(const QGeoPathPrivate &other);
     ~QGeoPathPrivate();
 
-    bool isValid() const Q_DECL_OVERRIDE;
-    bool isEmpty() const Q_DECL_OVERRIDE;
-    bool contains(const QGeoCoordinate &coordinate) const Q_DECL_OVERRIDE;
+    bool isValid() const override;
+    bool isEmpty() const override;
+    bool contains(const QGeoCoordinate &coordinate) const override;
     bool lineContains(const QGeoCoordinate &coordinate) const;
     bool polygonContains(const QGeoCoordinate &coordinate) const;
 
-    QGeoCoordinate center() const Q_DECL_OVERRIDE;
-    QGeoRectangle boundingGeoRectangle() const Q_DECL_OVERRIDE;
-    void extendShape(const QGeoCoordinate &coordinate) Q_DECL_OVERRIDE;
+    QGeoCoordinate center() const override;
+    QGeoRectangle boundingGeoRectangle() const override;
+    void extendShape(const QGeoCoordinate &coordinate) override;
     void translate(double degreesLatitude, double degreesLongitude);
 
-    QGeoShapePrivate *clone() const Q_DECL_OVERRIDE;
+    QGeoShapePrivate *clone() const override;
 
-    bool operator==(const QGeoShapePrivate &other) const Q_DECL_OVERRIDE;
+    bool operator==(const QGeoShapePrivate &other) const override;
 
     const QList<QGeoCoordinate> &path() const;
     void setPath(const QList<QGeoCoordinate> &path);
diff --git a/src/positioning/qgeorectangle_p.h b/src/positioning/qgeorectangle_p.h
index ee1b1732..ec3a2b53 100644
--- a/src/positioning/qgeorectangle_p.h
+++ b/src/positioning/qgeorectangle_p.h
@@ -64,19 +64,19 @@ public:
     QGeoRectanglePrivate(const QGeoRectanglePrivate &other);
     ~QGeoRectanglePrivate();
 
-    bool isValid() const Q_DECL_OVERRIDE;
-    bool isEmpty() const Q_DECL_OVERRIDE;
-    bool contains(const QGeoCoordinate &coordinate) const Q_DECL_OVERRIDE;
+    bool isValid() const override;
+    bool isEmpty() const override;
+    bool contains(const QGeoCoordinate &coordinate) const override;
 
-    QGeoCoordinate center() const Q_DECL_OVERRIDE;
+    QGeoCoordinate center() const override;
 
-    QGeoRectangle boundingGeoRectangle() const Q_DECL_OVERRIDE;
+    QGeoRectangle boundingGeoRectangle() const override;
 
-    void extendShape(const QGeoCoordinate &coordinate) Q_DECL_OVERRIDE;
+    void extendShape(const QGeoCoordinate &coordinate) override;
 
-    QGeoShapePrivate *clone() const Q_DECL_OVERRIDE;
+    QGeoShapePrivate *clone() const override;
 
-    bool operator==(const QGeoShapePrivate &other) const Q_DECL_OVERRIDE;
+    bool operator==(const QGeoShapePrivate &other) const override;
 
     QGeoCoordinate topLeft;
     QGeoCoordinate bottomRight;
diff --git a/src/positioning/qnmeapositioninfosource.h b/src/positioning/qnmeapositioninfosource.h
index d951f577..6bbc7181 100644
--- a/src/positioning/qnmeapositioninfosource.h
+++ b/src/positioning/qnmeapositioninfosource.h
@@ -55,7 +55,7 @@ public:
         SimulationMode
     };
 
-    explicit QNmeaPositionInfoSource(UpdateMode updateMode, QObject *parent = Q_NULLPTR);
+    explicit QNmeaPositionInfoSource(UpdateMode updateMode, QObject *parent = nullptr);
     ~QNmeaPositionInfoSource();
 
     void setUserEquivalentRangeError(double uere);
diff --git a/src/src.pro b/src/src.pro
index 9cef3da0..583ff666 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -21,14 +21,14 @@ qtHaveModule(quick) {
 
     plugins.depends += location
 
-    exists(locationlabs):qtConfig(labs_plugin) {
+    exists(locationlabs):qtConfig(locationlabs_plugin) {
         SUBDIRS += locationlabs
         locationlabs.depends += location
     }
 
     SUBDIRS += imports
     imports.depends += positioningquick positioning location
-    exists(locationlabs):qtConfig(labs_plugin): imports.depends += locationlabs
+    exists(locationlabs):qtConfig(locationlabs_plugin): imports.depends += locationlabs
 }
 plugins.depends += positioning
 SUBDIRS += plugins
diff --git a/tests/auto/geotestplugin/qplacemanagerengine_test.h b/tests/auto/geotestplugin/qplacemanagerengine_test.h
index 30e5422e..7245ccf1 100644
--- a/tests/auto/geotestplugin/qplacemanagerengine_test.h
+++ b/tests/auto/geotestplugin/qplacemanagerengine_test.h
@@ -374,7 +374,7 @@ public:
         }
     }
 
-    QPlaceDetailsReply *getPlaceDetails(const QString &placeId) Q_DECL_OVERRIDE
+    QPlaceDetailsReply *getPlaceDetails(const QString &placeId) override
     {
         DetailsReply *reply = new DetailsReply(this);
 
@@ -390,7 +390,7 @@ public:
         return reply;
     }
 
-    QPlaceContentReply *getPlaceContent(const QPlaceContentRequest &query) Q_DECL_OVERRIDE
+    QPlaceContentReply *getPlaceContent(const QPlaceContentRequest &query) override
     {
         ContentReply *reply = new ContentReply(this);
         if (query.placeId().isEmpty() || !m_places.contains(query.placeId())) {
@@ -458,7 +458,7 @@ public:
         return reply;
     }
 
-    QPlaceSearchReply *search(const QPlaceSearchRequest &query) Q_DECL_OVERRIDE
+    QPlaceSearchReply *search(const QPlaceSearchRequest &query) override
     {
         QList<QPlaceSearchResult> results;
 
@@ -503,7 +503,7 @@ public:
         return reply;
     }
 
-    QPlaceSearchSuggestionReply *searchSuggestions(const QPlaceSearchRequest &query) Q_DECL_OVERRIDE
+    QPlaceSearchSuggestionReply *searchSuggestions(const QPlaceSearchRequest &query) override
     {
         QStringList suggestions;
         if (query.searchTerm() == QLatin1String("test")) {
@@ -519,7 +519,7 @@ public:
         return reply;
     }
 
-    QPlaceIdReply *savePlace(const QPlace &place) Q_DECL_OVERRIDE
+    QPlaceIdReply *savePlace(const QPlace &place) override
     {
         IdReply *reply = new IdReply(QPlaceIdReply::SavePlace, this);
 
@@ -542,7 +542,7 @@ public:
         return reply;
     }
 
-    QPlaceIdReply *removePlace(const QString &placeId) Q_DECL_OVERRIDE
+    QPlaceIdReply *removePlace(const QString &placeId) override
     {
         IdReply *reply = new IdReply(QPlaceIdReply::RemovePlace, this);
         reply->setId(placeId);
@@ -559,7 +559,7 @@ public:
         return reply;
     }
 
-    QPlaceIdReply *saveCategory(const QPlaceCategory &category, const QString &parentId) Q_DECL_OVERRIDE
+    QPlaceIdReply *saveCategory(const QPlaceCategory &category, const QString &parentId) override
     {
         IdReply *reply = new IdReply(QPlaceIdReply::SaveCategory, this);
 
@@ -600,7 +600,7 @@ public:
         return reply;
     }
 
-    QPlaceIdReply *removeCategory(const QString &categoryId) Q_DECL_OVERRIDE
+    QPlaceIdReply *removeCategory(const QString &categoryId) override
     {
         IdReply *reply = new IdReply(QPlaceIdReply::RemoveCategory, this);
         reply->setId(categoryId);
@@ -623,7 +623,7 @@ public:
         return reply;
     }
 
-    QPlaceReply *initializeCategories() Q_DECL_OVERRIDE
+    QPlaceReply *initializeCategories() override
     {
         QPlaceReply *reply = new PlaceReply(this);
 
@@ -632,7 +632,7 @@ public:
         return reply;
     }
 
-    QString parentCategoryId(const QString &categoryId) const Q_DECL_OVERRIDE
+    QString parentCategoryId(const QString &categoryId) const override
     {
         QHashIterator<QString, QStringList> i(m_childCategories);
         while (i.hasNext()) {
@@ -644,17 +644,17 @@ public:
         return QString();
     }
 
-    virtual QStringList childCategoryIds(const QString &categoryId) const Q_DECL_OVERRIDE
+    virtual QStringList childCategoryIds(const QString &categoryId) const override
     {
         return m_childCategories.value(categoryId);
     }
 
-    virtual QPlaceCategory category(const QString &categoryId) const Q_DECL_OVERRIDE
+    virtual QPlaceCategory category(const QString &categoryId) const override
     {
         return m_categories.value(categoryId);
     }
 
-    QList<QPlaceCategory> childCategories(const QString &parentId) const Q_DECL_OVERRIDE
+    QList<QPlaceCategory> childCategories(const QString &parentId) const override
     {
         QList<QPlaceCategory> categories;
 
@@ -664,17 +664,17 @@ public:
         return categories;
     }
 
-    QList<QLocale> locales() const Q_DECL_OVERRIDE
+    QList<QLocale> locales() const override
     {
         return m_locales;
     }
 
-    void setLocales(const QList<QLocale> &locales) Q_DECL_OVERRIDE
+    void setLocales(const QList<QLocale> &locales) override
     {
         m_locales = locales;
     }
 
-    QUrl constructIconUrl(const QPlaceIcon &icon, const QSize &size) const Q_DECL_OVERRIDE
+    QUrl constructIconUrl(const QPlaceIcon &icon, const QSize &size) const override
     {
         QList<QPair<int, QUrl> > candidates;
 
@@ -711,7 +711,7 @@ public:
         }
     }
 
-    QPlace compatiblePlace(const QPlace &original) const Q_DECL_OVERRIDE
+    QPlace compatiblePlace(const QPlace &original) const override
     {
         QPlace place;
         place.setName(original.name());
diff --git a/tests/auto/qgeoserviceprovider/tst_qgeoserviceprovider.cpp b/tests/auto/qgeoserviceprovider/tst_qgeoserviceprovider.cpp
index c21608b3..e0c581ab 100644
--- a/tests/auto/qgeoserviceprovider/tst_qgeoserviceprovider.cpp
+++ b/tests/auto/qgeoserviceprovider/tst_qgeoserviceprovider.cpp
@@ -156,38 +156,38 @@ void tst_QGeoServiceProvider::tst_features()
     QCOMPARE(provider.placesFeatures(), placeFeatures);
 
     if (provider.mappingFeatures() == QGeoServiceProvider::NoMappingFeatures) {
-        QVERIFY(provider.mappingManager() == Q_NULLPTR);
+        QVERIFY(provider.mappingManager() == nullptr);
     } else {
         // some plugins require token/access parameter
         // they return 0 but set QGeoServiceProvider::MissingRequiredParameterError
-        if (provider.mappingManager() != Q_NULLPTR)
+        if (provider.mappingManager() != nullptr)
             QCOMPARE(provider.error(), QGeoServiceProvider::NoError);
         else
             QCOMPARE(provider.error(), QGeoServiceProvider::MissingRequiredParameterError);
     }
 
     if (provider.geocodingFeatures() == QGeoServiceProvider::NoGeocodingFeatures) {
-        QVERIFY(provider.geocodingManager() == Q_NULLPTR);
+        QVERIFY(provider.geocodingManager() == nullptr);
     } else {
-        if (provider.geocodingManager() != Q_NULLPTR)
-            QVERIFY(provider.geocodingManager() != Q_NULLPTR); //pointless but we want a VERIFY here
+        if (provider.geocodingManager() != nullptr)
+            QVERIFY(provider.geocodingManager() != nullptr); //pointless but we want a VERIFY here
         else
             QCOMPARE(provider.error(), QGeoServiceProvider::MissingRequiredParameterError);
     }
 
     if (provider.routingFeatures() == QGeoServiceProvider::NoRoutingFeatures) {
-        QVERIFY(provider.routingManager() == Q_NULLPTR);
+        QVERIFY(provider.routingManager() == nullptr);
     } else {
-        if (provider.routingManager() != Q_NULLPTR)
+        if (provider.routingManager() != nullptr)
             QCOMPARE(provider.error(), QGeoServiceProvider::NoError);
         else
             QCOMPARE(provider.error(), QGeoServiceProvider::MissingRequiredParameterError);
     }
 
     if (provider.placesFeatures() == QGeoServiceProvider::NoPlacesFeatures) {
-        QVERIFY(provider.placeManager() == Q_NULLPTR);
+        QVERIFY(provider.placeManager() == nullptr);
     } else {
-        if (provider.placeManager() != Q_NULLPTR)
+        if (provider.placeManager() != nullptr)
             QCOMPARE(provider.error(), QGeoServiceProvider::NoError);
         else
             QCOMPARE(provider.error(), QGeoServiceProvider::MissingRequiredParameterError);
diff --git a/tests/plugins/declarativetestplugin/testhelper.h b/tests/plugins/declarativetestplugin/testhelper.h
index 83cb4721..164d183b 100644
--- a/tests/plugins/declarativetestplugin/testhelper.h
+++ b/tests/plugins/declarativetestplugin/testhelper.h
@@ -41,7 +41,7 @@ class TestHelper: public QObject
 {
     Q_OBJECT
 public:
-    TestHelper(QObject *parent = Q_NULLPTR):QObject(parent){}
+    TestHelper(QObject *parent = nullptr):QObject(parent){}
     Q_INVOKABLE bool waitForPolished(QQuickItem *item, int timeout = 10000) const
     {
         QSignalSpy spy(item->window(), &QQuickWindow::afterAnimating);