Unify semicolon usage in Q_UNUSED

Change-Id: I36dd6881b6f6f028869d63b6311cba7f52a99cc4
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>

67 files changed, 186 insertions, 186 deletions

diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp
index 215fa61a..5057e5a1 100644
--- a/src/imports/positioning/positioning.cpp
+++ b/src/imports/positioning/positioning.cpp
@@ -551,8 +551,8 @@ QT_BEGIN_NAMESPACE
 
 static QObject *singleton_type_factory(QQmlEngine *engine, QJSEngine *jsEngine)
 {
-    Q_UNUSED(engine)
-    Q_UNUSED(jsEngine)
+    Q_UNUSED(engine);
+    Q_UNUSED(jsEngine);
 
     return new LocationSingleton;
 }
diff --git a/src/location/declarativemaps/qdeclarativegeocodemodel.cpp b/src/location/declarativemaps/qdeclarativegeocodemodel.cpp
index dcff0d44..3e1cca30 100644
--- a/src/location/declarativemaps/qdeclarativegeocodemodel.cpp
+++ b/src/location/declarativemaps/qdeclarativegeocodemodel.cpp
@@ -233,7 +233,7 @@ void QDeclarativeGeocodeModel::queryContentChanged()
 */
 int QDeclarativeGeocodeModel::rowCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent)
+    Q_UNUSED(parent);
     return declarativeLocations_.count();
 }
 
diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp
index 542b478e..997f8465 100644
--- a/src/location/declarativemaps/qdeclarativegeomap.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomap.cpp
@@ -2458,7 +2458,7 @@ void QDeclarativeGeoMap::wheelEvent(QWheelEvent *event)
 */
 bool QDeclarativeGeoMap::childMouseEventFilter(QQuickItem *item, QEvent *event)
 {
-    Q_UNUSED(item)
+    Q_UNUSED(item);
     if (!isVisible() || !isEnabled() || !isInteractive())
         return QQuickItem::childMouseEventFilter(item, event);
 
diff --git a/src/location/declarativemaps/qdeclarativegeomapitembase.cpp b/src/location/declarativemaps/qdeclarativegeomapitembase.cpp
index 7de6afb5..7ee8944e 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitembase.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomapitembase.cpp
@@ -225,7 +225,7 @@ float QDeclarativeGeoMapItemBase::zoomLevelOpacity() const
 
 bool QDeclarativeGeoMapItemBase::childMouseEventFilter(QQuickItem *item, QEvent *event)
 {
-    Q_UNUSED(item)
+    Q_UNUSED(item);
     if (event->type() == QEvent::MouseButtonPress && !contains(static_cast<QMouseEvent*>(event)->pos())) {
         // In case of items that are not rectangles, this filter is used to test if the event has landed
         // inside the actual item shape.
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp
index d404fd47..a769a0c9 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp
@@ -378,7 +378,7 @@ void QDeclarativeGeoMapItemView::removeDelegateFromMap(int index, bool transitio
             if (releaseStatus == QQmlInstanceModel::Referenced)
                 qWarning() << "item "<< index << "(" << item << ") still referenced";
 #else
-            Q_UNUSED(releaseStatus)
+            Q_UNUSED(releaseStatus);
 #endif
         }
     }
@@ -450,7 +450,7 @@ void QDeclarativeGeoMapItemView::exitTransitionFinished()
     if (releaseStatus == QQmlInstanceModel::Referenced)
         qWarning() << "item "<<item<<" still referenced";
 #else
-    Q_UNUSED(releaseStatus)
+    Q_UNUSED(releaseStatus);
 #endif
 }
 
diff --git a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp
index 96f4dad1..499f1c51 100644
--- a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp
+++ b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp
@@ -273,7 +273,7 @@ void QDeclarativeGeoRouteModel::componentComplete()
 */
 int QDeclarativeGeoRouteModel::rowCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent)
+    Q_UNUSED(parent);
     return routes_.count();
 }
 
diff --git a/src/location/declarativeplaces/qdeclarativesearchmodelbase.cpp b/src/location/declarativeplaces/qdeclarativesearchmodelbase.cpp
index 8bbe7f64..0d456f74 100644
--- a/src/location/declarativeplaces/qdeclarativesearchmodelbase.cpp
+++ b/src/location/declarativeplaces/qdeclarativesearchmodelbase.cpp
@@ -306,7 +306,7 @@ void QDeclarativeSearchModelBase::nextPage()
 */
 void QDeclarativeSearchModelBase::clearData(bool suppressSignal)
 {
-    Q_UNUSED(suppressSignal)
+    Q_UNUSED(suppressSignal);
 }
 
 /*!
diff --git a/src/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp b/src/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp
index c416858f..3e90283d 100644
--- a/src/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp
+++ b/src/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp
@@ -276,7 +276,7 @@ void QDeclarativeSearchSuggestionModel::clearData(bool suppressSignal)
 */
 int QDeclarativeSearchSuggestionModel::rowCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent)
+    Q_UNUSED(parent);
 
     return m_suggestions.count();
 }
diff --git a/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp b/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp
index 3bc45c4f..38bfb249 100644
--- a/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp
+++ b/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp
@@ -179,7 +179,7 @@ int QDeclarativeSupportedCategoriesModel::rowCount(const QModelIndex &parent) co
 */
 int QDeclarativeSupportedCategoriesModel::columnCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent)
+    Q_UNUSED(parent);
 
     return 1;
 }
diff --git a/src/location/labs/qmaprouteobject.cpp b/src/location/labs/qmaprouteobject.cpp
index c3365d30..a4a71cac 100644
--- a/src/location/labs/qmaprouteobject.cpp
+++ b/src/location/labs/qmaprouteobject.cpp
@@ -100,7 +100,7 @@ QGeoRoute QMapRouteObjectPrivate::route() const
 
 void QMapRouteObjectPrivate::setRoute(const QDeclarativeGeoRoute *route)
 {
-    Q_UNUSED(route)
+    Q_UNUSED(route);
 }
 
 bool QMapRouteObjectPrivate::equals(const QGeoMapObjectPrivate &other) const
diff --git a/src/location/labs/qsg/qmapcircleobjectqsg.cpp b/src/location/labs/qsg/qmapcircleobjectqsg.cpp
index 775016b9..269c9ebb 100644
--- a/src/location/labs/qsg/qmapcircleobjectqsg.cpp
+++ b/src/location/labs/qsg/qmapcircleobjectqsg.cpp
@@ -153,7 +153,7 @@ QSGNode *QMapCircleObjectPrivateQSG::updateMapObjectNode(QSGNode *oldNode,
                                                          QSGNode *root,
                                                          QQuickWindow * /*window*/)
 {
-//    Q_UNUSED(visibleNode) // coz of -Werror=unused-but-set-parameter
+//    Q_UNUSED(visibleNode); // coz of -Werror=unused-but-set-parameter
     MapPolygonNode *node = static_cast<MapPolygonNode *>(oldNode);
 
     bool created = false;
diff --git a/src/location/labs/qsg/qmapiconobjectqsg.cpp b/src/location/labs/qsg/qmapiconobjectqsg.cpp
index 1c621e5f..2e7a00e0 100644
--- a/src/location/labs/qsg/qmapiconobjectqsg.cpp
+++ b/src/location/labs/qsg/qmapiconobjectqsg.cpp
@@ -99,7 +99,7 @@ QSGNode *QMapIconObjectPrivateQSG::updateMapObjectNode(QSGNode *oldNode,
                                                        QSGNode *root,
                                                        QQuickWindow *window)
 {
-    Q_UNUSED(visibleNode)
+    Q_UNUSED(visibleNode);
     bool created = false;
     RootNode *node = static_cast<RootNode *>(oldNode);
     if (!node) {
diff --git a/src/location/labs/qsg/qmappolygonobjectqsg.cpp b/src/location/labs/qsg/qmappolygonobjectqsg.cpp
index 99a84ec5..01653a0e 100644
--- a/src/location/labs/qsg/qmappolygonobjectqsg.cpp
+++ b/src/location/labs/qsg/qmappolygonobjectqsg.cpp
@@ -80,7 +80,7 @@ QSGNode *QMapPolygonObjectPrivateQSG::updateMapObjectNode(QSGNode *oldNode,
                                                           QSGNode *root,
                                                           QQuickWindow * /*window*/)
 {
-    Q_UNUSED(visibleNode)
+    Q_UNUSED(visibleNode);
     MapPolygonNode *node = static_cast<MapPolygonNode *>(oldNode);
 
     bool created = false;
diff --git a/src/location/labs/qsg/qmappolylineobjectqsg.cpp b/src/location/labs/qsg/qmappolylineobjectqsg.cpp
index 5b184326..b2cdc607 100644
--- a/src/location/labs/qsg/qmappolylineobjectqsg.cpp
+++ b/src/location/labs/qsg/qmappolylineobjectqsg.cpp
@@ -102,7 +102,7 @@ QSGNode *QMapPolylineObjectPrivateQSG::updateMapObjectNode(QSGNode *oldNode,
                                                            QSGNode *root,
                                                            QQuickWindow * /*window*/)
 {
-    Q_UNUSED(visibleNode)
+    Q_UNUSED(visibleNode);
     MapPolylineNode *node = static_cast<MapPolylineNode *>(oldNode);
 
     bool created = false;
diff --git a/src/location/maps/qgeocodingmanagerengine.cpp b/src/location/maps/qgeocodingmanagerengine.cpp
index fb7d4e0e..0bb2c24b 100644
--- a/src/location/maps/qgeocodingmanagerengine.cpp
+++ b/src/location/maps/qgeocodingmanagerengine.cpp
@@ -83,7 +83,7 @@ QGeoCodingManagerEngine::QGeoCodingManagerEngine(const QVariantMap &parameters,
     : QObject(parent),
       d_ptr(new QGeoCodingManagerEnginePrivate())
 {
-    Q_UNUSED(parameters)
+    Q_UNUSED(parameters);
 }
 
 /*!
@@ -174,8 +174,8 @@ int QGeoCodingManagerEngine::managerVersion() const
 QGeoCodeReply *QGeoCodingManagerEngine::geocode(const QGeoAddress &address,
         const QGeoShape &bounds)
 {
-    Q_UNUSED(address)
-    Q_UNUSED(bounds)
+    Q_UNUSED(address);
+    Q_UNUSED(bounds);
     return new QGeoCodeReply(QGeoCodeReply::UnsupportedOptionError,
                                QLatin1String("Geocoding is not supported by this service provider."), this);
 }
@@ -219,8 +219,8 @@ QGeoCodeReply *QGeoCodingManagerEngine::geocode(const QGeoAddress &address,
 QGeoCodeReply *QGeoCodingManagerEngine::reverseGeocode(const QGeoCoordinate &coordinate,
                                                        const QGeoShape &bounds)
 {
-    Q_UNUSED(coordinate)
-    Q_UNUSED(bounds)
+    Q_UNUSED(coordinate);
+    Q_UNUSED(bounds);
     return new QGeoCodeReply(QGeoCodeReply::UnsupportedOptionError,
                                QLatin1String("Reverse geocoding is not supported by this service provider."), this);
 }
@@ -259,10 +259,10 @@ QGeoCodeReply *QGeoCodingManagerEngine::geocode(const QString &address,
                                                 int offset,
                                                 const QGeoShape &bounds)
 {
-    Q_UNUSED(address)
-    Q_UNUSED(limit)
-    Q_UNUSED(offset)
-    Q_UNUSED(bounds)
+    Q_UNUSED(address);
+    Q_UNUSED(limit);
+    Q_UNUSED(offset);
+    Q_UNUSED(bounds);
 
     return new QGeoCodeReply(QGeoCodeReply::UnsupportedOptionError,
                              QLatin1String("Searching is not supported by this service provider."), this);
diff --git a/src/location/maps/qgeomaneuver.cpp b/src/location/maps/qgeomaneuver.cpp
index 22f6f587..1dee942a 100644
--- a/src/location/maps/qgeomaneuver.cpp
+++ b/src/location/maps/qgeomaneuver.cpp
@@ -356,7 +356,7 @@ bool QGeoManeuverPrivate::valid() const
 
 void QGeoManeuverPrivate::setValid(bool valid)
 {
-    Q_UNUSED(valid)
+    Q_UNUSED(valid);
 }
 
 QString QGeoManeuverPrivate::id() const
@@ -366,7 +366,7 @@ QString QGeoManeuverPrivate::id() const
 
 void QGeoManeuverPrivate::setId(const QString id)
 {
-    Q_UNUSED(id)
+    Q_UNUSED(id);
 }
 
 QGeoCoordinate QGeoManeuverPrivate::position() const
@@ -376,7 +376,7 @@ QGeoCoordinate QGeoManeuverPrivate::position() const
 
 void QGeoManeuverPrivate::setPosition(const QGeoCoordinate &position)
 {
-    Q_UNUSED(position)
+    Q_UNUSED(position);
 }
 
 QString QGeoManeuverPrivate::text() const
@@ -386,7 +386,7 @@ QString QGeoManeuverPrivate::text() const
 
 void QGeoManeuverPrivate::setText(const QString &text)
 {
-    Q_UNUSED(text)
+    Q_UNUSED(text);
 }
 
 QGeoManeuver::InstructionDirection QGeoManeuverPrivate::direction() const
@@ -396,7 +396,7 @@ QGeoManeuver::InstructionDirection QGeoManeuverPrivate::direction() const
 
 void QGeoManeuverPrivate::setDirection(QGeoManeuver::InstructionDirection direction)
 {
-    Q_UNUSED(direction)
+    Q_UNUSED(direction);
 }
 
 int QGeoManeuverPrivate::timeToNextInstruction() const
@@ -406,7 +406,7 @@ int QGeoManeuverPrivate::timeToNextInstruction() const
 
 void QGeoManeuverPrivate::setTimeToNextInstruction(int timeToNextInstruction)
 {
-    Q_UNUSED(timeToNextInstruction)
+    Q_UNUSED(timeToNextInstruction);
 }
 
 qreal QGeoManeuverPrivate::distanceToNextInstruction() const
@@ -416,7 +416,7 @@ qreal QGeoManeuverPrivate::distanceToNextInstruction() const
 
 void QGeoManeuverPrivate::setDistanceToNextInstruction(qreal distanceToNextInstruction)
 {
-    Q_UNUSED(distanceToNextInstruction)
+    Q_UNUSED(distanceToNextInstruction);
 }
 
 QGeoCoordinate QGeoManeuverPrivate::waypoint() const
@@ -426,7 +426,7 @@ QGeoCoordinate QGeoManeuverPrivate::waypoint() const
 
 void QGeoManeuverPrivate::setWaypoint(const QGeoCoordinate &waypoint)
 {
-    Q_UNUSED(waypoint)
+    Q_UNUSED(waypoint);
 }
 
 QVariantMap QGeoManeuverPrivate::extendedAttributes() const
@@ -436,7 +436,7 @@ QVariantMap QGeoManeuverPrivate::extendedAttributes() const
 
 void QGeoManeuverPrivate::setExtendedAttributes(const QVariantMap &extendedAttributes)
 {
-    Q_UNUSED(extendedAttributes)
+    Q_UNUSED(extendedAttributes);
 }
 
 
diff --git a/src/location/maps/qgeomap.cpp b/src/location/maps/qgeomap.cpp
index bf5e557d..80edac1a 100644
--- a/src/location/maps/qgeomap.cpp
+++ b/src/location/maps/qgeomap.cpp
@@ -106,7 +106,7 @@ void QGeoMap::setCameraCapabilities(const QGeoCameraCapabilities &cameraCapabili
 
 bool QGeoMap::handleEvent(QEvent *event)
 {
-    Q_UNUSED(event)
+    Q_UNUSED(event);
     return false;
 }
 
@@ -137,8 +137,8 @@ bool QGeoMap::anchorCoordinateToPoint(const QGeoCoordinate &coordinate, const QP
 
 bool QGeoMap::fitViewportToGeoRectangle(const QGeoRectangle &rectangle, const QMargins &borders)
 {
-    Q_UNUSED(rectangle)
-    Q_UNUSED(borders)
+    Q_UNUSED(rectangle);
+    Q_UNUSED(borders);
     return false;
 }
 
@@ -333,11 +333,11 @@ QString QGeoMap::copyrightsStyleSheet() const
 
 void QGeoMap::setAcceptedGestures(bool pan, bool flick, bool pinch, bool rotate, bool tilt)
 {
-    Q_UNUSED(pan)
-    Q_UNUSED(flick)
-    Q_UNUSED(pinch)
-    Q_UNUSED(rotate)
-    Q_UNUSED(tilt)
+    Q_UNUSED(pan);
+    Q_UNUSED(flick);
+    Q_UNUSED(pinch);
+    Q_UNUSED(rotate);
+    Q_UNUSED(tilt);
 }
 
 void QGeoMap::setCopyrightVisible(bool visible)
@@ -388,12 +388,12 @@ const QGeoMapPrivate *QGeoMapPrivate::get(const QGeoMap &map)
 
 void QGeoMapPrivate::addParameter(QGeoMapParameter *param)
 {
-    Q_UNUSED(param)
+    Q_UNUSED(param);
 }
 
 void QGeoMapPrivate::removeParameter(QGeoMapParameter *param)
 {
-    Q_UNUSED(param)
+    Q_UNUSED(param);
 }
 
 QGeoMap::ItemTypes QGeoMapPrivate::supportedMapItemTypes() const
@@ -403,17 +403,17 @@ QGeoMap::ItemTypes QGeoMapPrivate::supportedMapItemTypes() const
 
 void QGeoMapPrivate::addMapItem(QDeclarativeGeoMapItemBase *item)
 {
-    Q_UNUSED(item)
+    Q_UNUSED(item);
 }
 
 void QGeoMapPrivate::removeMapItem(QDeclarativeGeoMapItemBase *item)
 {
-    Q_UNUSED(item)
+    Q_UNUSED(item);
 }
 
 QGeoMapObjectPrivate *QGeoMapPrivate::createMapObjectImplementation(QGeoMapObject *obj)
 {
-    Q_UNUSED(obj)
+    Q_UNUSED(obj);
     return nullptr;
 }
 
diff --git a/src/location/maps/qgeomappingmanager.cpp b/src/location/maps/qgeomappingmanager.cpp
index d73050f7..00982c8a 100644
--- a/src/location/maps/qgeomappingmanager.cpp
+++ b/src/location/maps/qgeomappingmanager.cpp
@@ -133,7 +133,7 @@ int QGeoMappingManager::managerVersion() const
 */
 QGeoMap *QGeoMappingManager::createMap(QObject *parent)
 {
-    Q_UNUSED(parent)
+    Q_UNUSED(parent);
     return d_ptr->engine->createMap();
 }
 
diff --git a/src/location/maps/qgeomappingmanagerengine.cpp b/src/location/maps/qgeomappingmanagerengine.cpp
index 187b30eb..663e9917 100644
--- a/src/location/maps/qgeomappingmanagerengine.cpp
+++ b/src/location/maps/qgeomappingmanagerengine.cpp
@@ -152,7 +152,7 @@ void QGeoMappingManagerEngine::setSupportedMapTypes(const QList<QGeoMapType> &su
 
 QGeoCameraCapabilities QGeoMappingManagerEngine::cameraCapabilities(int mapId) const
 {
-    Q_UNUSED(mapId)
+    Q_UNUSED(mapId);
     Q_D(const QGeoMappingManagerEngine);
 
     if (mapId == 0)
diff --git a/src/location/maps/qgeoprojection.cpp b/src/location/maps/qgeoprojection.cpp
index 0fdb5f0b..f64060e2 100644
--- a/src/location/maps/qgeoprojection.cpp
+++ b/src/location/maps/qgeoprojection.cpp
@@ -101,8 +101,8 @@ QGeoProjection::~QGeoProjection()
 
 QGeoCoordinate QGeoProjection::anchorCoordinateToPoint(const QGeoCoordinate &coordinate, const QPointF &anchorPoint) const
 {
-    Q_UNUSED(coordinate)
-    Q_UNUSED(anchorPoint)
+    Q_UNUSED(coordinate);
+    Q_UNUSED(anchorPoint);
     return QGeoCoordinate();
 }
 
@@ -113,8 +113,8 @@ QGeoShape QGeoProjection::visibleRegion() const
 
 bool QGeoProjection::setBearing(qreal bearing, const QGeoCoordinate &coordinate)
 {
-    Q_UNUSED(bearing)
-    Q_UNUSED(coordinate)
+    Q_UNUSED(bearing);
+    Q_UNUSED(coordinate);
     return false;
 }
 
diff --git a/src/location/maps/qgeoroute.cpp b/src/location/maps/qgeoroute.cpp
index ef54e4aa..ffa9a496 100644
--- a/src/location/maps/qgeoroute.cpp
+++ b/src/location/maps/qgeoroute.cpp
@@ -395,7 +395,7 @@ bool QGeoRoutePrivate::equals(const QGeoRoutePrivate &other) const
 
 void QGeoRoutePrivate::setId(const QString &id)
 {
-    Q_UNUSED(id)
+    Q_UNUSED(id);
 }
 
 QString QGeoRoutePrivate::id() const
@@ -405,7 +405,7 @@ QString QGeoRoutePrivate::id() const
 
 void QGeoRoutePrivate::setRequest(const QGeoRouteRequest &request)
 {
-    Q_UNUSED(request)
+    Q_UNUSED(request);
 }
 
 QGeoRouteRequest QGeoRoutePrivate::request() const
@@ -415,7 +415,7 @@ QGeoRouteRequest QGeoRoutePrivate::request() const
 
 void QGeoRoutePrivate::setBounds(const QGeoRectangle &bounds)
 {
-    Q_UNUSED(bounds)
+    Q_UNUSED(bounds);
 }
 
 QGeoRectangle QGeoRoutePrivate::bounds() const
@@ -425,7 +425,7 @@ QGeoRectangle QGeoRoutePrivate::bounds() const
 
 void QGeoRoutePrivate::setTravelTime(int travelTime)
 {
-    Q_UNUSED(travelTime)
+    Q_UNUSED(travelTime);
 }
 
 int QGeoRoutePrivate::travelTime() const
@@ -435,7 +435,7 @@ int QGeoRoutePrivate::travelTime() const
 
 void QGeoRoutePrivate::setDistance(qreal distance)
 {
-    Q_UNUSED(distance)
+    Q_UNUSED(distance);
 }
 
 qreal QGeoRoutePrivate::distance() const
@@ -445,7 +445,7 @@ qreal QGeoRoutePrivate::distance() const
 
 void QGeoRoutePrivate::setTravelMode(QGeoRouteRequest::TravelMode mode)
 {
-    Q_UNUSED(mode)
+    Q_UNUSED(mode);
 }
 
 QGeoRouteRequest::TravelMode QGeoRoutePrivate::travelMode() const
@@ -455,7 +455,7 @@ QGeoRouteRequest::TravelMode QGeoRoutePrivate::travelMode() const
 
 void QGeoRoutePrivate::setPath(const QList<QGeoCoordinate> &path)
 {
-    Q_UNUSED(path)
+    Q_UNUSED(path);
 }
 
 QList<QGeoCoordinate> QGeoRoutePrivate::path() const
@@ -465,7 +465,7 @@ QList<QGeoCoordinate> QGeoRoutePrivate::path() const
 
 void QGeoRoutePrivate::setFirstSegment(const QGeoRouteSegment &firstSegment)
 {
-    Q_UNUSED(firstSegment)
+    Q_UNUSED(firstSegment);
 }
 
 QGeoRouteSegment QGeoRoutePrivate::firstSegment() const
diff --git a/src/location/maps/qgeoroutesegment.cpp b/src/location/maps/qgeoroutesegment.cpp
index aff54fc7..0e350d0a 100644
--- a/src/location/maps/qgeoroutesegment.cpp
+++ b/src/location/maps/qgeoroutesegment.cpp
@@ -298,7 +298,7 @@ bool QGeoRouteSegmentPrivate::valid() const
 
 void QGeoRouteSegmentPrivate::setValid(bool valid)
 {
-    Q_UNUSED(valid)
+    Q_UNUSED(valid);
 }
 
 bool QGeoRouteSegmentPrivate::isLegLastSegment() const
@@ -308,7 +308,7 @@ bool QGeoRouteSegmentPrivate::isLegLastSegment() const
 
 void QGeoRouteSegmentPrivate::setLegLastSegment(bool lastSegment)
 {
-    Q_UNUSED(lastSegment)
+    Q_UNUSED(lastSegment);
 }
 
 int QGeoRouteSegmentPrivate::travelTime() const
@@ -318,7 +318,7 @@ int QGeoRouteSegmentPrivate::travelTime() const
 
 void QGeoRouteSegmentPrivate::setTravelTime(int travelTime)
 {
-    Q_UNUSED(travelTime)
+    Q_UNUSED(travelTime);
 }
 
 qreal QGeoRouteSegmentPrivate::distance() const
@@ -328,7 +328,7 @@ qreal QGeoRouteSegmentPrivate::distance() const
 
 void QGeoRouteSegmentPrivate::setDistance(qreal distance)
 {
-    Q_UNUSED(distance)
+    Q_UNUSED(distance);
 }
 
 QList<QGeoCoordinate> QGeoRouteSegmentPrivate::path() const
@@ -338,7 +338,7 @@ QList<QGeoCoordinate> QGeoRouteSegmentPrivate::path() const
 
 void QGeoRouteSegmentPrivate::setPath(const QList<QGeoCoordinate> &path)
 {
-    Q_UNUSED(path)
+    Q_UNUSED(path);
 }
 
 QGeoManeuver QGeoRouteSegmentPrivate::maneuver() const
@@ -348,7 +348,7 @@ QGeoManeuver QGeoRouteSegmentPrivate::maneuver() const
 
 void QGeoRouteSegmentPrivate::setManeuver(const QGeoManeuver &maneuver)
 {
-    Q_UNUSED(maneuver)
+    Q_UNUSED(maneuver);
 }
 
 QExplicitlySharedDataPointer<QGeoRouteSegmentPrivate> QGeoRouteSegmentPrivate::nextRouteSegment() const
diff --git a/src/location/maps/qgeoroutingmanagerengine.cpp b/src/location/maps/qgeoroutingmanagerengine.cpp
index aa307057..df6d762d 100644
--- a/src/location/maps/qgeoroutingmanagerengine.cpp
+++ b/src/location/maps/qgeoroutingmanagerengine.cpp
@@ -86,7 +86,7 @@ QGeoRoutingManagerEngine::QGeoRoutingManagerEngine(const QVariantMap &parameters
     : QObject(parent),
       d_ptr(new QGeoRoutingManagerEnginePrivate())
 {
-    Q_UNUSED(parameters)
+    Q_UNUSED(parameters);
 }
 
 /*!
@@ -196,8 +196,8 @@ int QGeoRoutingManagerEngine::managerVersion() const
 */
 QGeoRouteReply *QGeoRoutingManagerEngine::updateRoute(const QGeoRoute &route, const QGeoCoordinate &position)
 {
-    Q_UNUSED(route)
-    Q_UNUSED(position)
+    Q_UNUSED(route);
+    Q_UNUSED(position);
     return new QGeoRouteReply(QGeoRouteReply::UnsupportedOptionError,
                               QLatin1String("The updating of routes is not supported by this service provider."), this);
 }
diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp
index d2f98b4d..1792b7c5 100644
--- a/src/location/maps/qgeoserviceprovider.cpp
+++ b/src/location/maps/qgeoserviceprovider.cpp
@@ -860,7 +860,7 @@ void QGeoServiceProviderPrivate::loadMeta()
 
 void QGeoServiceProviderPrivate::loadPlugin(const QVariantMap &parameters)
 {
-    Q_UNUSED(parameters)
+    Q_UNUSED(parameters);
 
     if (int(metaData.value(QStringLiteral("index")).toDouble()) < 0) {
         error = QGeoServiceProvider::NotSupportedError;
diff --git a/src/location/maps/qgeoserviceproviderfactory.cpp b/src/location/maps/qgeoserviceproviderfactory.cpp
index 65a88710..d9438d74 100644
--- a/src/location/maps/qgeoserviceproviderfactory.cpp
+++ b/src/location/maps/qgeoserviceproviderfactory.cpp
@@ -80,9 +80,9 @@ QGeoCodingManagerEngine *QGeoServiceProviderFactory::createGeocodingManagerEngin
                                                                                   QGeoServiceProvider::Error *error,
                                                                                   QString *errorString) const
 {
-    Q_UNUSED(parameters)
-    Q_UNUSED(error)
-    Q_UNUSED(errorString)
+    Q_UNUSED(parameters);
+    Q_UNUSED(error);
+    Q_UNUSED(errorString);
 
     return 0;
 }
@@ -106,9 +106,9 @@ QGeoMappingManagerEngine *QGeoServiceProviderFactory::createMappingManagerEngine
                                                                                  QGeoServiceProvider::Error *error,
                                                                                  QString *errorString) const
 {
-    Q_UNUSED(parameters)
-    Q_UNUSED(error)
-    Q_UNUSED(errorString)
+    Q_UNUSED(parameters);
+    Q_UNUSED(error);
+    Q_UNUSED(errorString);
 
     return 0;
 }
@@ -131,9 +131,9 @@ QGeoRoutingManagerEngine *QGeoServiceProviderFactory::createRoutingManagerEngine
                                                                                  QString *errorString) const
 
 {
-    Q_UNUSED(parameters)
-    Q_UNUSED(error)
-    Q_UNUSED(errorString)
+    Q_UNUSED(parameters);
+    Q_UNUSED(error);
+    Q_UNUSED(errorString);
 
     return 0;
 }
@@ -156,9 +156,9 @@ QPlaceManagerEngine *QGeoServiceProviderFactory::createPlaceManagerEngine(const
                                                                           QString *errorString) const
 
 {
-    Q_UNUSED(parameters)
-    Q_UNUSED(error)
-    Q_UNUSED(errorString)
+    Q_UNUSED(parameters);
+    Q_UNUSED(error);
+    Q_UNUSED(errorString);
 
     return 0;
 }
@@ -200,9 +200,9 @@ Destroys this QGeoServiceProviderFactoryV2 instance.
 */
 QNavigationManagerEngine *QGeoServiceProviderFactoryV2::createNavigationManagerEngine(const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const
 {
-    Q_UNUSED(parameters)
-    Q_UNUSED(error)
-    Q_UNUSED(errorString)
+    Q_UNUSED(parameters);
+    Q_UNUSED(error);
+    Q_UNUSED(errorString);
 
     return 0;
 }
@@ -216,7 +216,7 @@ QNavigationManagerEngine *QGeoServiceProviderFactoryV2::createNavigationManagerE
 */
 void QGeoServiceProviderFactoryV3::setQmlEngine(QQmlEngine *engine)
 {
-    Q_UNUSED(engine)
+    Q_UNUSED(engine);
 }
 
 QT_END_NAMESPACE
diff --git a/src/location/maps/qgeotiledmapscene.cpp b/src/location/maps/qgeotiledmapscene.cpp
index 074b67c6..a5f94c8d 100644
--- a/src/location/maps/qgeotiledmapscene.cpp
+++ b/src/location/maps/qgeotiledmapscene.cpp
@@ -533,7 +533,7 @@ void QGeoTiledMapRootNode::updateTiles(QGeoTiledMapTileContainerNode *root,
                 if (ogl)
                     static_cast<QSGDefaultImageNode *>(node)->setAnisotropyLevel(QSGTexture::Anisotropy16x);
 #else
-    Q_UNUSED(ogl)
+    Q_UNUSED(ogl);
 #endif
                 dirtyBits |= QSGNode::DirtyMaterial;
             }
diff --git a/src/location/maps/qnavigationmanagerengine.cpp b/src/location/maps/qnavigationmanagerengine.cpp
index 770e30a6..d0f8418e 100644
--- a/src/location/maps/qnavigationmanagerengine.cpp
+++ b/src/location/maps/qnavigationmanagerengine.cpp
@@ -90,7 +90,7 @@ QNavigationManagerEngine::QNavigationManagerEngine(const QVariantMap &parameters
     : QObject(parent)
     , d(new QNavigationManagerEnginePrivate)
 {
-    Q_UNUSED(parameters)
+    Q_UNUSED(parameters);
 }
 
 QNavigationManagerEngine::~QNavigationManagerEngine()
diff --git a/src/location/places/qplacemanagerengine.cpp b/src/location/places/qplacemanagerengine.cpp
index d14b7e67..c7ed68ed 100644
--- a/src/location/places/qplacemanagerengine.cpp
+++ b/src/location/places/qplacemanagerengine.cpp
@@ -75,7 +75,7 @@ QPlaceManagerEngine::QPlaceManagerEngine(const QVariantMap &parameters,
 {
     qRegisterMetaType<QPlaceReply::Error>();
     qRegisterMetaType<QPlaceReply *>();
-    Q_UNUSED(parameters)
+    Q_UNUSED(parameters);
 }
 
 /*!
@@ -140,7 +140,7 @@ int QPlaceManagerEngine::managerVersion() const
 */
 QPlaceDetailsReply *QPlaceManagerEngine::getPlaceDetails(const QString &placeId)
 {
-    Q_UNUSED(placeId)
+    Q_UNUSED(placeId);
 
     return new QPlaceDetailsReplyUnsupported(this);
 }
@@ -150,7 +150,7 @@ QPlaceDetailsReply *QPlaceManagerEngine::getPlaceDetails(const QString &placeId)
 */
 QPlaceContentReply *QPlaceManagerEngine::getPlaceContent(const QPlaceContentRequest &request)
 {
-    Q_UNUSED(request)
+    Q_UNUSED(request);
 
     return new QPlaceContentReplyUnsupported(this);
 }
@@ -160,7 +160,7 @@ QPlaceContentReply *QPlaceManagerEngine::getPlaceContent(const QPlaceContentRequ
 */
 QPlaceSearchReply *QPlaceManagerEngine::search(const QPlaceSearchRequest &request)
 {
-    Q_UNUSED(request)
+    Q_UNUSED(request);
 
     return new QPlaceSearchReplyUnsupported(QPlaceReply::UnsupportedError,
                                             QStringLiteral("Place search is not supported."), this);
@@ -172,7 +172,7 @@ QPlaceSearchReply *QPlaceManagerEngine::search(const QPlaceSearchRequest &reques
 QPlaceSearchSuggestionReply *QPlaceManagerEngine::searchSuggestions(
         const QPlaceSearchRequest &request)
 {
-    Q_UNUSED(request)
+    Q_UNUSED(request);
 
     return new QPlaceSearchSuggestionReplyUnsupported(this);
 }
@@ -182,7 +182,7 @@ QPlaceSearchSuggestionReply *QPlaceManagerEngine::searchSuggestions(
 */
 QPlaceIdReply *QPlaceManagerEngine::savePlace(const QPlace &place)
 {
-    Q_UNUSED(place)
+    Q_UNUSED(place);
 
     return new QPlaceIdReplyUnsupported(QStringLiteral("Save place is not supported"),
                                         QPlaceIdReply::SavePlace, this);
@@ -193,7 +193,7 @@ QPlaceIdReply *QPlaceManagerEngine::savePlace(const QPlace &place)
 */
 QPlaceIdReply *QPlaceManagerEngine::removePlace(const QString &placeId)
 {
-    Q_UNUSED(placeId)
+    Q_UNUSED(placeId);
 
     return new QPlaceIdReplyUnsupported(QStringLiteral("Remove place is not supported"),
                                         QPlaceIdReply::RemovePlace, this);
@@ -206,8 +206,8 @@ QPlaceIdReply *QPlaceManagerEngine::removePlace(const QString &placeId)
 QPlaceIdReply *QPlaceManagerEngine::saveCategory(const QPlaceCategory &category,
                                                  const QString &parentId)
 {
-    Q_UNUSED(category)
-    Q_UNUSED(parentId)
+    Q_UNUSED(category);
+    Q_UNUSED(parentId);
 
     return new QPlaceIdReplyUnsupported(QStringLiteral("Save category is not supported"),
                                         QPlaceIdReply::SaveCategory, this);
@@ -219,7 +219,7 @@ QPlaceIdReply *QPlaceManagerEngine::saveCategory(const QPlaceCategory &category,
 
 QPlaceIdReply *QPlaceManagerEngine::removeCategory(const QString &categoryId)
 {
-    Q_UNUSED(categoryId)
+    Q_UNUSED(categoryId);
 
     return new QPlaceIdReplyUnsupported(QStringLiteral("Remove category is not supported"),
                                         QPlaceIdReply::RemoveCategory, this);
@@ -238,7 +238,7 @@ QPlaceReply *QPlaceManagerEngine::initializeCategories()
 */
 QString QPlaceManagerEngine::parentCategoryId(const QString &categoryId) const
 {
-    Q_UNUSED(categoryId)
+    Q_UNUSED(categoryId);
 
     return QString();
 }
@@ -249,7 +249,7 @@ QString QPlaceManagerEngine::parentCategoryId(const QString &categoryId) const
 */
 QStringList QPlaceManagerEngine::childCategoryIds(const QString &categoryId) const
 {
-    Q_UNUSED(categoryId)
+    Q_UNUSED(categoryId);
 
     return QStringList();
 }
@@ -259,7 +259,7 @@ QStringList QPlaceManagerEngine::childCategoryIds(const QString &categoryId) con
 */
 QPlaceCategory QPlaceManagerEngine::category(const QString &categoryId) const
 {
-    Q_UNUSED(categoryId)
+    Q_UNUSED(categoryId);
 
     return QPlaceCategory();
 }
@@ -270,7 +270,7 @@ QPlaceCategory QPlaceManagerEngine::category(const QString &categoryId) const
 */
 QList<QPlaceCategory> QPlaceManagerEngine::childCategories(const QString &parentId) const
 {
-    Q_UNUSED(parentId)
+    Q_UNUSED(parentId);
 
     return QList<QPlaceCategory>();
 }
@@ -297,7 +297,7 @@ QList<QLocale> QPlaceManagerEngine::locales() const
 */
 void QPlaceManagerEngine::setLocales(const QList<QLocale> &locales)
 {
-    Q_UNUSED(locales)
+    Q_UNUSED(locales);
 }
 
 /*!
@@ -328,7 +328,7 @@ QPlace QPlaceManagerEngine::compatiblePlace(const QPlace &original) const
 */
 QPlaceMatchReply * QPlaceManagerEngine::matchingPlaces(const QPlaceMatchRequest &request)
 {
-    Q_UNUSED(request)
+    Q_UNUSED(request);
 
     return new QPlaceMatchReplyUnsupported(this);
 }
diff --git a/src/plugins/geoservices/esri/geocodereply_esri.cpp b/src/plugins/geoservices/esri/geocodereply_esri.cpp
index fd1071c9..eca3def1 100644
--- a/src/plugins/geoservices/esri/geocodereply_esri.cpp
+++ b/src/plugins/geoservices/esri/geocodereply_esri.cpp
@@ -73,7 +73,7 @@ GeoCodeReplyEsri::~GeoCodeReplyEsri()
 
 void GeoCodeReplyEsri::networkReplyError(QNetworkReply::NetworkError error)
 {
-    Q_UNUSED(error)
+    Q_UNUSED(error);
     QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
     reply->deleteLater();
     setError(QGeoCodeReply::CommunicationError, reply->errorString());
diff --git a/src/plugins/geoservices/esri/geocodingmanagerengine_esri.cpp b/src/plugins/geoservices/esri/geocodingmanagerengine_esri.cpp
index 17ed3cd2..5a40467e 100644
--- a/src/plugins/geoservices/esri/geocodingmanagerengine_esri.cpp
+++ b/src/plugins/geoservices/esri/geocodingmanagerengine_esri.cpp
@@ -106,7 +106,7 @@ QGeoCodeReply *GeoCodingManagerEngineEsri::geocode(const QGeoAddress &address,
 QGeoCodeReply *GeoCodingManagerEngineEsri::geocode(const QString &address, int limit, int offset,
                                                    const QGeoShape &bounds)
 {
-    Q_UNUSED(offset)
+    Q_UNUSED(offset);
 
     QNetworkRequest request;
     request.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent);
@@ -140,7 +140,7 @@ QGeoCodeReply *GeoCodingManagerEngineEsri::geocode(const QString &address, int l
 QGeoCodeReply *GeoCodingManagerEngineEsri::reverseGeocode(const QGeoCoordinate &coordinate,
                                                           const QGeoShape &bounds)
 {
-    Q_UNUSED(bounds)
+    Q_UNUSED(bounds);
 
     QNetworkRequest request;
     request.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent);
diff --git a/src/plugins/geoservices/esri/georoutereply_esri.cpp b/src/plugins/geoservices/esri/georoutereply_esri.cpp
index 95de6b55..a47db6fb 100644
--- a/src/plugins/geoservices/esri/georoutereply_esri.cpp
+++ b/src/plugins/geoservices/esri/georoutereply_esri.cpp
@@ -87,7 +87,7 @@ void GeoRouteReplyEsri::networkReplyFinished()
 
 void GeoRouteReplyEsri::networkReplyError(QNetworkReply::NetworkError error)
 {
-    Q_UNUSED(error)
+    Q_UNUSED(error);
     QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
     reply->deleteLater();
     setError(QGeoRouteReply::CommunicationError, reply->errorString());
diff --git a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp
index dede9dbc..f6520484 100644
--- a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp
+++ b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp
@@ -112,7 +112,7 @@ bool QGeoMapItemsOverlay::createMapObjectImplementation(QGeoMapObject *obj)
 QSGNode *QGeoMapItemsOverlay::updateSceneGraph(QSGNode *node, QQuickWindow *window)
 {
 #ifndef LOCATIONLABS
-    Q_UNUSED(window)
+    Q_UNUSED(window);
     return node;
 #else
     Q_D(QGeoMapItemsOverlay);
diff --git a/src/plugins/geoservices/itemsoverlay/qgeomappingmanagerengineitemsoverlay.cpp b/src/plugins/geoservices/itemsoverlay/qgeomappingmanagerengineitemsoverlay.cpp
index c19815e8..abaffdb7 100644
--- a/src/plugins/geoservices/itemsoverlay/qgeomappingmanagerengineitemsoverlay.cpp
+++ b/src/plugins/geoservices/itemsoverlay/qgeomappingmanagerengineitemsoverlay.cpp
@@ -47,9 +47,9 @@ QT_BEGIN_NAMESPACE
 QGeoMappingManagerEngineItemsOverlay::QGeoMappingManagerEngineItemsOverlay(const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString)
 :   QGeoMappingManagerEngine()
 {
-    Q_UNUSED(parameters)
-    Q_UNUSED(error)
-    Q_UNUSED(errorString)
+    Q_UNUSED(parameters);
+    Q_UNUSED(error);
+    Q_UNUSED(errorString);
     QGeoCameraCapabilities cameraCaps;
     cameraCaps.setMinimumZoomLevel(0.0);
     cameraCaps.setMaximumZoomLevel(30.0);
diff --git a/src/plugins/geoservices/itemsoverlay/qgeoserviceproviderpluginitemsoverlay.cpp b/src/plugins/geoservices/itemsoverlay/qgeoserviceproviderpluginitemsoverlay.cpp
index b83a5eb1..417e1ee4 100644
--- a/src/plugins/geoservices/itemsoverlay/qgeoserviceproviderpluginitemsoverlay.cpp
+++ b/src/plugins/geoservices/itemsoverlay/qgeoserviceproviderpluginitemsoverlay.cpp
@@ -42,9 +42,9 @@ QT_BEGIN_NAMESPACE
 QGeoCodingManagerEngine *QGeoServiceProviderFactoryItemsOverlay::createGeocodingManagerEngine(
     const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const
 {
-    Q_UNUSED(parameters)
-    Q_UNUSED(error)
-    Q_UNUSED(errorString)
+    Q_UNUSED(parameters);
+    Q_UNUSED(error);
+    Q_UNUSED(errorString);
 
     return 0;
 }
@@ -58,9 +58,9 @@ QGeoMappingManagerEngine *QGeoServiceProviderFactoryItemsOverlay::createMappingM
 QGeoRoutingManagerEngine *QGeoServiceProviderFactoryItemsOverlay::createRoutingManagerEngine(
     const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const
 {
-    Q_UNUSED(parameters)
-    Q_UNUSED(error)
-    Q_UNUSED(errorString)
+    Q_UNUSED(parameters);
+    Q_UNUSED(error);
+    Q_UNUSED(errorString);
 
     return 0;
 }
@@ -68,9 +68,9 @@ QGeoRoutingManagerEngine *QGeoServiceProviderFactoryItemsOverlay::createRoutingM
 QPlaceManagerEngine *QGeoServiceProviderFactoryItemsOverlay::createPlaceManagerEngine(
     const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const
 {
-    Q_UNUSED(parameters)
-    Q_UNUSED(error)
-    Q_UNUSED(errorString)
+    Q_UNUSED(parameters);
+    Q_UNUSED(error);
+    Q_UNUSED(errorString);
 
     return 0;
 }
diff --git a/src/plugins/geoservices/mapbox/qgeocodereplymapbox.cpp b/src/plugins/geoservices/mapbox/qgeocodereplymapbox.cpp
index db7a35c4..bb84b531 100644
--- a/src/plugins/geoservices/mapbox/qgeocodereplymapbox.cpp
+++ b/src/plugins/geoservices/mapbox/qgeocodereplymapbox.cpp
@@ -97,7 +97,7 @@ void QGeoCodeReplyMapbox::onNetworkReplyFinished()
 
 void QGeoCodeReplyMapbox::onNetworkReplyError(QNetworkReply::NetworkError error)
 {
-    Q_UNUSED(error)
+    Q_UNUSED(error);
     QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
     reply->deleteLater();
     setError(QGeoCodeReply::CommunicationError, reply->errorString());
diff --git a/src/plugins/geoservices/mapbox/qgeocodingmanagerenginemapbox.cpp b/src/plugins/geoservices/mapbox/qgeocodingmanagerenginemapbox.cpp
index e0c4f6a5..3780d6ca 100644
--- a/src/plugins/geoservices/mapbox/qgeocodingmanagerenginemapbox.cpp
+++ b/src/plugins/geoservices/mapbox/qgeocodingmanagerenginemapbox.cpp
@@ -137,7 +137,7 @@ QGeoCodeReply *QGeoCodingManagerEngineMapbox::geocode(const QGeoAddress &address
 
 QGeoCodeReply *QGeoCodingManagerEngineMapbox::geocode(const QString &address, int limit, int offset, const QGeoShape &bounds)
 {
-    Q_UNUSED(offset)
+    Q_UNUSED(offset);
 
     QUrlQuery queryItems;
     queryItems.addQueryItem(QStringLiteral("type"), allAddressTypes);
diff --git a/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp b/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp
index 8b0772ad..86da24ab 100644
--- a/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp
+++ b/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp
@@ -155,7 +155,7 @@ void QGeoRouteReplyMapbox::networkReplyFinished()
 
 void QGeoRouteReplyMapbox::networkReplyError(QNetworkReply::NetworkError error)
 {
-    Q_UNUSED(error)
+    Q_UNUSED(error);
     QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
     reply->deleteLater();
     setError(QGeoRouteReply::CommunicationError, reply->errorString());
diff --git a/src/plugins/geoservices/mapbox/qplacemanagerenginemapbox.cpp b/src/plugins/geoservices/mapbox/qplacemanagerenginemapbox.cpp
index 56678a45..4fb8cd1d 100644
--- a/src/plugins/geoservices/mapbox/qplacemanagerenginemapbox.cpp
+++ b/src/plugins/geoservices/mapbox/qplacemanagerenginemapbox.cpp
@@ -264,7 +264,7 @@ QPlaceReply *QPlaceManagerEngineMapbox::initializeCategories()
 
 QString QPlaceManagerEngineMapbox::parentCategoryId(const QString &categoryId) const
 {
-    Q_UNUSED(categoryId)
+    Q_UNUSED(categoryId);
 
     // Only a single category level.
     return QString();
diff --git a/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp b/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp
index b2f2f043..8d34d2ec 100644
--- a/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp
+++ b/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp
@@ -222,7 +222,7 @@ void QPlaceSearchReplyMapbox::onReplyFinished()
 
 void QPlaceSearchReplyMapbox::onNetworkError(QNetworkReply::NetworkError error)
 {
-    Q_UNUSED(error)
+    Q_UNUSED(error);
     QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
     reply->deleteLater();
     setError(CommunicationError, reply->errorString());
diff --git a/src/plugins/geoservices/mapbox/qplacesearchsuggestionreplymapbox.cpp b/src/plugins/geoservices/mapbox/qplacesearchsuggestionreplymapbox.cpp
index 23d76175..8c0bfdc1 100644
--- a/src/plugins/geoservices/mapbox/qplacesearchsuggestionreplymapbox.cpp
+++ b/src/plugins/geoservices/mapbox/qplacesearchsuggestionreplymapbox.cpp
@@ -111,7 +111,7 @@ void QPlaceSearchSuggestionReplyMapbox::onReplyFinished()
 
 void QPlaceSearchSuggestionReplyMapbox::onNetworkError(QNetworkReply::NetworkError error)
 {
-    Q_UNUSED(error)
+    Q_UNUSED(error);
     QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
     reply->deleteLater();
     setError(CommunicationError, reply->errorString());
diff --git a/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp b/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp
index afa723a5..dfc0be0b 100644
--- a/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp
+++ b/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp
@@ -49,9 +49,9 @@ QGeoServiceProviderFactoryMapboxGL::QGeoServiceProviderFactoryMapboxGL()
 QGeoCodingManagerEngine *QGeoServiceProviderFactoryMapboxGL::createGeocodingManagerEngine(
     const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const
 {
-    Q_UNUSED(parameters)
-    Q_UNUSED(error)
-    Q_UNUSED(errorString)
+    Q_UNUSED(parameters);
+    Q_UNUSED(error);
+    Q_UNUSED(errorString);
 
     return 0;
 }
@@ -65,9 +65,9 @@ QGeoMappingManagerEngine *QGeoServiceProviderFactoryMapboxGL::createMappingManag
 QGeoRoutingManagerEngine *QGeoServiceProviderFactoryMapboxGL::createRoutingManagerEngine(
     const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const
 {
-    Q_UNUSED(parameters)
-    Q_UNUSED(error)
-    Q_UNUSED(errorString)
+    Q_UNUSED(parameters);
+    Q_UNUSED(error);
+    Q_UNUSED(errorString);
 
     return 0;
 }
@@ -75,9 +75,9 @@ QGeoRoutingManagerEngine *QGeoServiceProviderFactoryMapboxGL::createRoutingManag
 QPlaceManagerEngine *QGeoServiceProviderFactoryMapboxGL::createPlaceManagerEngine(
     const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const
 {
-    Q_UNUSED(parameters)
-    Q_UNUSED(error)
-    Q_UNUSED(errorString)
+    Q_UNUSED(parameters);
+    Q_UNUSED(error);
+    Q_UNUSED(errorString);
 
     return 0;
 }
diff --git a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
index 0fb6eb2a..2a8549ff 100644
--- a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
@@ -99,7 +99,7 @@ void QGeoCodeReplyNokia::networkFinished()
 
 void QGeoCodeReplyNokia::networkError(QNetworkReply::NetworkError error)
 {
-    Q_UNUSED(error)
+    Q_UNUSED(error);
 
     QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
     reply->deleteLater();
@@ -118,7 +118,7 @@ void QGeoCodeReplyNokia::appendResults(const QList<QGeoLocation> &locations)
 
 void QGeoCodeReplyNokia::parseError(const QString &errorString)
 {
-    Q_UNUSED(errorString)
+    Q_UNUSED(errorString);
 
     setError(QGeoCodeReply::ParseError,
              QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, RESPONSE_NOT_RECOGNIZABLE));
diff --git a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp
index b5fdfee1..941a0200 100644
--- a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp
@@ -119,7 +119,7 @@ void QGeoRouteReplyNokia::appendResults(const QList<QGeoRoute> &routes)
 
 void QGeoRouteReplyNokia::parserError(const QString &errorString)
 {
-    Q_UNUSED(errorString)
+    Q_UNUSED(errorString);
     emit aborted();
     setError(QGeoRouteReply::ParseError,
              QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, RESPONSE_NOT_RECOGNIZABLE));
diff --git a/src/plugins/geoservices/nokia/qgeouriprovider.cpp b/src/plugins/geoservices/nokia/qgeouriprovider.cpp
index cef3d484..7be90bb2 100644
--- a/src/plugins/geoservices/nokia/qgeouriprovider.cpp
+++ b/src/plugins/geoservices/nokia/qgeouriprovider.cpp
@@ -84,8 +84,8 @@ void QGeoUriProvider::setCurrentHost(const QString &host)
 
 void QGeoUriProvider::mobileCountryCodeChanged(int interfaceId, const QString& mcc)
 {
-    Q_UNUSED(interfaceId)
-    Q_UNUSED(mcc)
+    Q_UNUSED(interfaceId);
+    Q_UNUSED(mcc);
 
     setCurrentHost(isInternationalNetwork() || m_localizedHost.isEmpty() ? m_internationalHost : m_localizedHost);
 }
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
index 5094b72e..3b507ff2 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
@@ -556,7 +556,7 @@ QPlaceIdReply *QPlaceManagerEngineNokiaV2::removePlace(const QString &placeId)
 
 QPlaceIdReply *QPlaceManagerEngineNokiaV2::saveCategory(const QPlaceCategory &category, const QString &parentId)
 {
-    Q_UNUSED(parentId)
+    Q_UNUSED(parentId);
 
     QPlaceIdReplyImpl *reply = new QPlaceIdReplyImpl(QPlaceIdReply::SaveCategory, this);
     reply->setId(category.categoryId());
@@ -735,7 +735,7 @@ QPlaceIcon QPlaceManagerEngineNokiaV2::icon(const QString &remotePath,
 QUrl QPlaceManagerEngineNokiaV2::constructIconUrl(const QPlaceIcon &icon,
                                                         const QSize &size) const
 {
-    Q_UNUSED(size)
+    Q_UNUSED(size);
     QVariantMap params = icon.parameters();
     QString nokiaIcon = params.value(NokiaIcon).toString();
 
diff --git a/src/plugins/geoservices/osm/qgeocodereplyosm.cpp b/src/plugins/geoservices/osm/qgeocodereplyosm.cpp
index e6a487ba..885ba397 100644
--- a/src/plugins/geoservices/osm/qgeocodereplyosm.cpp
+++ b/src/plugins/geoservices/osm/qgeocodereplyosm.cpp
@@ -190,7 +190,7 @@ void QGeoCodeReplyOsm::networkReplyFinished()
 
 void QGeoCodeReplyOsm::networkReplyError(QNetworkReply::NetworkError error)
 {
-    Q_UNUSED(error)
+    Q_UNUSED(error);
     QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
     reply->deleteLater();
     setError(QGeoCodeReply::CommunicationError, reply->errorString());
diff --git a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp
index b2744551..85554c76 100644
--- a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp
+++ b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp
@@ -106,7 +106,7 @@ QGeoCodeReply *QGeoCodingManagerEngineOsm::geocode(const QGeoAddress &address, c
 
 QGeoCodeReply *QGeoCodingManagerEngineOsm::geocode(const QString &address, int limit, int offset, const QGeoShape &bounds)
 {
-    Q_UNUSED(offset)
+    Q_UNUSED(offset);
 
     QNetworkRequest request;
     request.setRawHeader("User-Agent", m_userAgent);
@@ -148,7 +148,7 @@ QGeoCodeReply *QGeoCodingManagerEngineOsm::geocode(const QString &address, int l
 QGeoCodeReply *QGeoCodingManagerEngineOsm::reverseGeocode(const QGeoCoordinate &coordinate,
                                                           const QGeoShape &bounds)
 {
-    Q_UNUSED(bounds)
+    Q_UNUSED(bounds);
 
     QNetworkRequest request;
     request.setRawHeader("User-Agent", m_userAgent);
diff --git a/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp b/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp
index d79702cf..3bb1ea7b 100644
--- a/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp
+++ b/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp
@@ -82,7 +82,7 @@ QSharedPointer<QGeoTileTexture> QGeoFileTileCacheOsm::get(const QGeoTileSpec &sp
 void QGeoFileTileCacheOsm::onProviderResolutionFinished(const QGeoTileProviderOsm *provider)
 {
     clearObsoleteTiles(provider);
-    Q_UNUSED(provider)
+    Q_UNUSED(provider);
     for (int i = 0; i < m_providers.size(); i++) {
         if (m_providers[i]->isHighDpi() != m_highDpi[i]) { // e.g., HiDpi was requested but only LoDpi is available
             int mapId = m_providers[i]->mapType().mapId();
@@ -103,7 +103,7 @@ void QGeoFileTileCacheOsm::onProviderResolutionFinished(const QGeoTileProviderOs
 // Hardcoded fallbacks also have a timestamp, that can get updated with Qt releases.
 void QGeoFileTileCacheOsm::onProviderResolutionError(const QGeoTileProviderOsm *provider, QNetworkReply::NetworkError error)
 {
-    Q_UNUSED(error)
+    Q_UNUSED(error);
     clearObsoleteTiles(provider); // this still removes tiles who happen to be older than qgeotileproviderosm.cpp defaultTs
 }
 
diff --git a/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp b/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp
index af2a03b1..e60dc068 100644
--- a/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp
+++ b/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp
@@ -94,7 +94,7 @@ void QGeoRouteReplyOsm::networkReplyFinished()
 
 void QGeoRouteReplyOsm::networkReplyError(QNetworkReply::NetworkError error)
 {
-    Q_UNUSED(error)
+    Q_UNUSED(error);
     QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
     reply->deleteLater();
     setError(QGeoRouteReply::CommunicationError, reply->errorString());
diff --git a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
index f7ab8c99..c0837024 100644
--- a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
+++ b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
@@ -183,7 +183,7 @@ void QGeoTileProviderOsm::disableRedirection()
 
 void QGeoTileProviderOsm::onResolutionFinished(TileProvider *provider)
 {
-    Q_UNUSED(provider)
+    Q_UNUSED(provider);
     // provider and m_provider are the same, at this point. m_status is Resolving.
     m_status = Resolved;
     emit resolutionFinished(this);
@@ -191,7 +191,7 @@ void QGeoTileProviderOsm::onResolutionFinished(TileProvider *provider)
 
 void QGeoTileProviderOsm::onResolutionError(TileProvider *provider)
 {
-    Q_UNUSED(provider)
+    Q_UNUSED(provider);
     // provider and m_provider are the same at this point. m_status is Resolving.
     if (!m_provider || m_provider->isInvalid()) {
         m_provider = nullptr;
diff --git a/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp b/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp
index be66414f..80964d35 100644
--- a/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp
+++ b/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp
@@ -220,7 +220,7 @@ QPlaceReply *QPlaceManagerEngineOsm::initializeCategories()
 
 QString QPlaceManagerEngineOsm::parentCategoryId(const QString &categoryId) const
 {
-    Q_UNUSED(categoryId)
+    Q_UNUSED(categoryId);
 
     // Only a two category levels
     return QString();
diff --git a/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp b/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp
index 80c50d1b..d65b0735 100644
--- a/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp
+++ b/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp
@@ -165,7 +165,7 @@ void QPlaceSearchReplyOsm::replyFinished()
 
 void QPlaceSearchReplyOsm::networkError(QNetworkReply::NetworkError error)
 {
-    Q_UNUSED(error)
+    Q_UNUSED(error);
     QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
     reply->deleteLater();
     setError(QPlaceReply::CommunicationError, reply->errorString());
diff --git a/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm b/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm
index 421f7743..dc3903de 100644
--- a/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm
+++ b/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm
@@ -64,8 +64,8 @@
 
 - (void)locationManager:(CLLocationManager *)manager didUpdateToLocation:(CLLocation *)newLocation fromLocation:(CLLocation *)oldLocation
 {
-    Q_UNUSED(manager)
-    Q_UNUSED(oldLocation)
+    Q_UNUSED(manager);
+    Q_UNUSED(oldLocation);
 
     // Convert location timestamp to QDateTime
     QDateTime timeStamp;
@@ -94,7 +94,7 @@
 
 - (void)locationManager:(CLLocationManager *)manager didFailWithError:(NSError *)error
 {
-    Q_UNUSED(manager)
+    Q_UNUSED(manager);
     m_positionInfoSource->setError(QGeoPositionInfoSource::AccessError);
 
     qWarning() << QString::fromNSString([error localizedDescription]);
@@ -309,7 +309,7 @@ void QGeoPositionInfoSourceCL::locationDataAvailable(QGeoPositionInfo location)
 
 QGeoPositionInfo QGeoPositionInfoSourceCL::lastKnownPosition(bool fromSatellitePositioningMethodsOnly) const
 {
-    Q_UNUSED(fromSatellitePositioningMethodsOnly)
+    Q_UNUSED(fromSatellitePositioningMethodsOnly);
 
     return m_lastUpdate;
 }
diff --git a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
index 6dfdc377..a82cfb63 100644
--- a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
+++ b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
@@ -186,7 +186,7 @@ void QGeoPositionInfoSourceGeoclueMaster::updateVelocity(VelocityFields fields,
                                                          double speed, double direction,
                                                          double climb)
 {
-    Q_UNUSED(timestamp)
+    Q_UNUSED(timestamp);
 
     // Store the velocity and mark it as fresh. Simple but hopefully adequate.
     m_lastVelocity = (fields & Speed) ? knotsToMetersPerSecond(speed) : qQNaN();
@@ -360,8 +360,8 @@ void QGeoPositionInfoSourceGeoclueMaster::positionProviderChanged(const QString
                                                                   const QString &service,
                                                                   const QString &path)
 {
-    Q_UNUSED(name)
-    Q_UNUSED(description)
+    Q_UNUSED(name);
+    Q_UNUSED(description);
 
     cleanupPositionSource();
 
diff --git a/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.cpp b/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.cpp
index d39d5f1b..efd62f8c 100644
--- a/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.cpp
+++ b/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.cpp
@@ -61,7 +61,7 @@ QGeoSatelliteInfoSource *QGeoPositionInfoSourceFactoryGeoclue::satelliteInfoSour
 
 QGeoAreaMonitorSource *QGeoPositionInfoSourceFactoryGeoclue::areaMonitor(QObject *parent)
 {
-    Q_UNUSED(parent)
+    Q_UNUSED(parent);
     return 0;
 }
 
diff --git a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp
index b7524d84..9ad20ace 100644
--- a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp
+++ b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp
@@ -147,7 +147,7 @@ void QGeoSatelliteInfoSourceGeoclueMaster::updateSatelliteInfo(int timestamp, in
                                                                const QList<int> &usedPrn,
                                                                const QList<QGeoSatelliteInfo> &satInfos)
 {
-    Q_UNUSED(timestamp)
+    Q_UNUSED(timestamp);
 
     QList<QGeoSatelliteInfo> inUse;
 
@@ -216,8 +216,8 @@ void QGeoSatelliteInfoSourceGeoclueMaster::positionProviderChanged(const QString
                                                                    const QString &service,
                                                                    const QString &path)
 {
-    Q_UNUSED(name)
-    Q_UNUSED(description)
+    Q_UNUSED(name);
+    Q_UNUSED(description);
 
     cleanupSatelliteSource();
 
diff --git a/src/plugins/position/geoclue2/qgeopositioninfosourcefactory_geoclue2.cpp b/src/plugins/position/geoclue2/qgeopositioninfosourcefactory_geoclue2.cpp
index a713c31f..b885e1eb 100644
--- a/src/plugins/position/geoclue2/qgeopositioninfosourcefactory_geoclue2.cpp
+++ b/src/plugins/position/geoclue2/qgeopositioninfosourcefactory_geoclue2.cpp
@@ -53,13 +53,13 @@ QGeoPositionInfoSource *QGeoPositionInfoSourceFactoryGeoclue2::positionInfoSourc
 
 QGeoSatelliteInfoSource *QGeoPositionInfoSourceFactoryGeoclue2::satelliteInfoSource(QObject *parent)
 {
-    Q_UNUSED(parent)
+    Q_UNUSED(parent);
     return nullptr;
 }
 
 QGeoAreaMonitorSource *QGeoPositionInfoSourceFactoryGeoclue2::areaMonitor(QObject *parent)
 {
-    Q_UNUSED(parent)
+    Q_UNUSED(parent);
     return nullptr;
 }
 
diff --git a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
index fe783bd2..c3b9efaa 100644
--- a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
+++ b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
@@ -208,7 +208,7 @@ QGeoPositionInfo QGeoPositionInfoSourceWinRT::lastKnownPosition(bool fromSatelli
 {
     qCDebug(lcPositioningWinRT) << __FUNCTION__;
     Q_D(const QGeoPositionInfoSourceWinRT);
-    Q_UNUSED(fromSatellitePositioningMethodsOnly)
+    Q_UNUSED(fromSatellitePositioningMethodsOnly);
     return d->lastPosition;
 }
 
diff --git a/src/positioning/doc/snippets/cpp/cppqml.cpp b/src/positioning/doc/snippets/cpp/cppqml.cpp
index 3db55714..c3d0139e 100644
--- a/src/positioning/doc/snippets/cpp/cppqml.cpp
+++ b/src/positioning/doc/snippets/cpp/cppqml.cpp
@@ -103,14 +103,14 @@ public:
 public Q_SLOTS:
     void areaEntered(const QGeoAreaMonitorInfo &mon, const QGeoPositionInfo &update)
     {
-        Q_UNUSED(mon)
+        Q_UNUSED(mon);
 
         qDebug() << "Now within 100 meters, current position is" << update.coordinate();
     }
 
     void areaExited(const QGeoAreaMonitorInfo &mon, const QGeoPositionInfo &update)
     {
-        Q_UNUSED(mon)
+        Q_UNUSED(mon);
 
         qDebug() << "No longer within 100 meters, current position is" << update.coordinate();
     }
diff --git a/src/positioning/qnmeapositioninfosource.cpp b/src/positioning/qnmeapositioninfosource.cpp
index 0b8c3ede..58d935f3 100644
--- a/src/positioning/qnmeapositioninfosource.cpp
+++ b/src/positioning/qnmeapositioninfosource.cpp
@@ -146,7 +146,7 @@ static bool mergePositions(QGeoPositionInfo &dst, const QGeoPositionInfo &src, Q
     QGeoPositionInfoPrivateNmea *dstPimpl = static_cast<QGeoPositionInfoPrivateNmea *>(QGeoPositionInfoPrivate::get(dst));
     dstPimpl->nmeaSentences.append(nmeaSentence);
 #else
-    Q_UNUSED(nmeaSentence)
+    Q_UNUSED(nmeaSentence);
 #endif
     return updated;
 }
diff --git a/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h b/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h
index 5a8ff451..fd92f6e3 100644
--- a/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h
+++ b/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h
@@ -93,8 +93,8 @@ public:
                                 timerId_(0),
                                 errorCode_(QGeoCodeReply::NoError)
     {
-        Q_UNUSED(error)
-        Q_UNUSED(errorString)
+        Q_UNUSED(error);
+        Q_UNUSED(errorString);
         if (parameters.contains("supported"))
             supported_ = qvariant_cast<bool>(parameters.value("supported"));
         if (parameters.contains("finishRequestImmediately"))
diff --git a/tests/auto/geotestplugin/qgeomappingmanagerengine_test.h b/tests/auto/geotestplugin/qgeomappingmanagerengine_test.h
index 07d832c2..828d95bc 100644
--- a/tests/auto/geotestplugin/qgeomappingmanagerengine_test.h
+++ b/tests/auto/geotestplugin/qgeomappingmanagerengine_test.h
@@ -77,8 +77,8 @@ public:
         timerId_(0),
         errorCode_(QGeoTiledMapReply::NoError)
     {
-        Q_UNUSED(error)
-        Q_UNUSED(errorString)
+        Q_UNUSED(error);
+        Q_UNUSED(errorString);
         if (parameters.contains("finishRequestImmediately"))
             finishRequestImmediately_ = qvariant_cast<bool>(parameters.value("finishRequestImmediately"));
         setLocale(QLocale (QLocale::German, QLocale::Germany));
diff --git a/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h b/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h
index 303015b7..7a6d6cec 100644
--- a/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h
+++ b/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h
@@ -56,7 +56,7 @@ public:
 
     void setTravelTime(int travelTime) override
     {
-        Q_UNUSED(travelTime)
+        Q_UNUSED(travelTime);
     }
 };
 
@@ -101,8 +101,8 @@ public:
         errorCode_(QGeoRouteReply::NoError),
         alternateGeoRouteImplementation_(false)
     {
-        Q_UNUSED(error)
-        Q_UNUSED(errorString)
+        Q_UNUSED(error);
+        Q_UNUSED(errorString);
 
         if (parameters.contains("gc_finishRequestImmediately")) {
             finishRequestImmediately_ = qvariant_cast<bool>(parameters.value("gc_finishRequestImmediately"));
diff --git a/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h b/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h
index 0db78336..f5279530 100644
--- a/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h
+++ b/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h
@@ -49,8 +49,8 @@ public:
         QGeoServiceProvider::Error *error, QString *errorString) :
         QGeoTiledMappingManagerEngine()
     {
-        Q_UNUSED(error)
-        Q_UNUSED(errorString)
+        Q_UNUSED(error);
+        Q_UNUSED(errorString);
 
         setLocale(QLocale (QLocale::German, QLocale::Germany));
         QGeoCameraCapabilities capabilities;
diff --git a/tests/auto/positionplugin/plugin.cpp b/tests/auto/positionplugin/plugin.cpp
index 919549db..a15a89a5 100644
--- a/tests/auto/positionplugin/plugin.cpp
+++ b/tests/auto/positionplugin/plugin.cpp
@@ -199,14 +199,14 @@ QGeoPositionInfoSource *QGeoPositionInfoSourceFactoryTest::positionInfoSource(QO
 
 QGeoSatelliteInfoSource *QGeoPositionInfoSourceFactoryTest::satelliteInfoSource(QObject *parent)
 {
-    Q_UNUSED(parent)
+    Q_UNUSED(parent);
     // not implemented
     return 0;
 }
 
 QGeoAreaMonitorSource *QGeoPositionInfoSourceFactoryTest::areaMonitor(QObject* parent)
 {
-    Q_UNUSED(parent)
+    Q_UNUSED(parent);
     return 0;
 }
 
diff --git a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h
index 6d887646..0f505f77 100644
--- a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h
+++ b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h
@@ -64,8 +64,8 @@ public:
                                 QGeoServiceProvider::Error *error, QString *errorString) :
                                 QGeoCodingManagerEngine(parameters)
     {
-        Q_UNUSED(error)
-        Q_UNUSED(errorString)
+        Q_UNUSED(error);
+        Q_UNUSED(errorString);
         setLocale(QLocale(QLocale::German, QLocale::Germany));
     }
 
diff --git a/tests/auto/qgeoroutingmanagerplugins/qgeoroutingmanagerengine_test.h b/tests/auto/qgeoroutingmanagerplugins/qgeoroutingmanagerengine_test.h
index cb75fecb..67c8f651 100644
--- a/tests/auto/qgeoroutingmanagerplugins/qgeoroutingmanagerengine_test.h
+++ b/tests/auto/qgeoroutingmanagerplugins/qgeoroutingmanagerengine_test.h
@@ -46,8 +46,8 @@ public:
         QGeoServiceProvider::Error *error, QString *errorString) :
         QGeoRoutingManagerEngine(parameters)
     {
-        Q_UNUSED(error)
-        Q_UNUSED(errorString)
+        Q_UNUSED(error);
+        Q_UNUSED(errorString);
         setSupportedTravelModes(QGeoRouteRequest::PedestrianTravel);
         setSupportedFeatureTypes(QGeoRouteRequest::TollFeature);
         setSupportedFeatureWeights(QGeoRouteRequest::PreferFeatureWeight);