Add ; to Q_UNUSED and UNUSED_PARAM

This is required to remove the ; from the macro with Qt 6.

Task-number: QTBUG-82978
Change-Id: Iead53d18fd790fb2d870d80ef2db79666f0d2392
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

17 files changed, 25 insertions, 25 deletions

diff --git a/src/quick/accessible/qaccessiblequickitem.cpp b/src/quick/accessible/qaccessiblequickitem.cpp
index 5e1ae25c38..bca03b496d 100644
--- a/src/quick/accessible/qaccessiblequickitem.cpp
+++ b/src/quick/accessible/qaccessiblequickitem.cpp
@@ -339,7 +339,7 @@ void QAccessibleQuickItem::doAction(const QString &actionName)
 
 QStringList QAccessibleQuickItem::keyBindingsForAction(const QString &actionName) const
 {
-    Q_UNUSED(actionName)
+    Q_UNUSED(actionName);
     return QStringList();
 }
 
diff --git a/src/quick/accessible/qaccessiblequickview.cpp b/src/quick/accessible/qaccessiblequickview.cpp
index b23b0316f5..b0d2c485f1 100644
--- a/src/quick/accessible/qaccessiblequickview.cpp
+++ b/src/quick/accessible/qaccessiblequickview.cpp
@@ -120,7 +120,7 @@ QString QAccessibleQuickWindow::text(QAccessible::Text text) const
         return QString::fromLatin1(object()->metaObject()->className()) ;
     }
 #else
-    Q_UNUSED(text)
+    Q_UNUSED(text);
 #endif
     return window()->title();
 }
diff --git a/src/quick/designer/qquickdesignercustomobjectdata.cpp b/src/quick/designer/qquickdesignercustomobjectdata.cpp
index 66a86bffd5..86a14b622e 100644
--- a/src/quick/designer/qquickdesignercustomobjectdata.cpp
+++ b/src/quick/designer/qquickdesignercustomobjectdata.cpp
@@ -291,8 +291,8 @@ void QQuickDesignerCustomObjectData::keepBindingFromGettingDeleted(QQmlContext *
                                                              const QQuickDesignerSupport::PropertyName &propertyName)
 {
     //Refcounting is taking care
-    Q_UNUSED(context)
-    Q_UNUSED(propertyName)
+    Q_UNUSED(context);
+    Q_UNUSED(propertyName);
 }
 
 void QQuickDesignerCustomObjectData::handleDestroyed()
diff --git a/src/quick/designer/qquickdesignersupportitems.cpp b/src/quick/designer/qquickdesignersupportitems.cpp
index 4fd9158f4a..cec4fa2d7c 100644
--- a/src/quick/designer/qquickdesignersupportitems.cpp
+++ b/src/quick/designer/qquickdesignersupportitems.cpp
@@ -214,7 +214,7 @@ QObject *QQuickDesignerSupportItems::createPrimitive(const QString &typeName, QT
 {
     ComponentCompleteDisabler disableComponentComplete;
 
-    Q_UNUSED(disableComponentComplete)
+    Q_UNUSED(disableComponentComplete);
 
     QObject *object = nullptr;
     QQmlType type = QQmlMetaType::qmlType(typeName, version);
@@ -260,7 +260,7 @@ QObject *QQuickDesignerSupportItems::createPrimitive(const QString &typeName, QT
 QObject *QQuickDesignerSupportItems::createComponent(const QUrl &componentUrl, QQmlContext *context)
 {
     ComponentCompleteDisabler disableComponentComplete;
-    Q_UNUSED(disableComponentComplete)
+    Q_UNUSED(disableComponentComplete);
 
     QQmlComponent component(context->engine(), componentUrl);
 
diff --git a/src/quick/designer/qquickdesignerwindowmanager.cpp b/src/quick/designer/qquickdesignerwindowmanager.cpp
index 04df6b2832..18daab70e8 100644
--- a/src/quick/designer/qquickdesignerwindowmanager.cpp
+++ b/src/quick/designer/qquickdesignerwindowmanager.cpp
@@ -86,7 +86,7 @@ void QQuickDesignerWindowManager::makeOpenGLContext(QQuickWindow *window)
         m_openGlContext->makeCurrent(window);
     }
 #else
-    Q_UNUSED(window)
+    Q_UNUSED(window);
 #endif
 }
 
diff --git a/src/quick/handlers/qquickpointerhandler.cpp b/src/quick/handlers/qquickpointerhandler.cpp
index 2a02511402..ce59a35b62 100644
--- a/src/quick/handlers/qquickpointerhandler.cpp
+++ b/src/quick/handlers/qquickpointerhandler.cpp
@@ -605,7 +605,7 @@ void QQuickPointerHandler::handlePointerEvent(QQuickPointerEvent *event)
 bool QQuickPointerHandler::wantsPointerEvent(QQuickPointerEvent *event)
 {
     Q_D(const QQuickPointerHandler);
-    Q_UNUSED(event)
+    Q_UNUSED(event);
     return d->enabled;
 }
 
diff --git a/src/quick/handlers/qquickwheelhandler.cpp b/src/quick/handlers/qquickwheelhandler.cpp
index 64bf5bc540..b55d9aa27b 100644
--- a/src/quick/handlers/qquickwheelhandler.cpp
+++ b/src/quick/handlers/qquickwheelhandler.cpp
@@ -479,7 +479,7 @@ void QQuickWheelHandler::handleEventPoint(QQuickEventPoint *point)
 
 void QQuickWheelHandler::onTargetChanged(QQuickItem *oldTarget)
 {
-    Q_UNUSED(oldTarget)
+    Q_UNUSED(oldTarget);
     Q_D(QQuickWheelHandler);
     d->metaPropertyDirty = true;
 }
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 4b231befd9..d705d08f71 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -144,7 +144,7 @@ Q_QUICK_PRIVATE_EXPORT QColor qt_color_from_string(const QV4::Value &name)
         return QColor(p);
     else {
         bool isRgb(false), isHsl(false), hasAlpha(false);
-        Q_UNUSED(isHsl)
+        Q_UNUSED(isHsl);
 
         while (isspace(*p)) p++;
         if (strncmp(p, "rgb", 3) == 0)
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index a709ea18be..e02ae15373 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -274,7 +274,7 @@ void QQuickContents::updateRect()
 
 void QQuickContents::itemGeometryChanged(QQuickItem *changed, QQuickGeometryChange change, const QRectF &)
 {
-    Q_UNUSED(changed)
+    Q_UNUSED(changed);
     bool wChanged = false;
     bool hChanged = false;
     //### we can only pass changed if the left edge has moved left, or the right edge has moved right
@@ -3813,7 +3813,7 @@ void QQuickItem::geometryChange(const QRectF &newGeometry, const QRectF &oldGeom
 
 QSGNode *QQuickItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData)
 {
-    Q_UNUSED(updatePaintNodeData)
+    Q_UNUSED(updatePaintNodeData);
     delete oldNode;
     return nullptr;
 }
@@ -8804,7 +8804,7 @@ void QQuickItemLayer::setName(const QByteArray &name) {
 
 void QQuickItemLayer::itemOpacityChanged(QQuickItem *item)
 {
-    Q_UNUSED(item)
+    Q_UNUSED(item);
     updateOpacity();
 }
 
@@ -8815,7 +8815,7 @@ void QQuickItemLayer::itemGeometryChanged(QQuickItem *, QQuickGeometryChange, co
 
 void QQuickItemLayer::itemParentChanged(QQuickItem *item, QQuickItem *parent)
 {
-    Q_UNUSED(item)
+    Q_UNUSED(item);
     Q_ASSERT(item == m_item);
     Q_ASSERT(parent != m_effectSource);
     Q_ASSERT(parent == nullptr || parent != m_effect);
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index bdbf23bfe2..7917b51c26 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -3553,7 +3553,7 @@ bool QQuickTextInputPrivate::finishChange(int validateFromState, bool update, bo
 {
     Q_Q(QQuickTextInput);
 
-    Q_UNUSED(update)
+    Q_UNUSED(update);
 #if QT_CONFIG(im)
     bool inputMethodAttributesChanged = m_textDirty || m_selDirty;
 #endif
@@ -3666,7 +3666,7 @@ void QQuickTextInputPrivate::internalSetText(const QString &txt, int pos, bool e
 
     bool changed = finishChange(-1, true, edited);
 #if !QT_CONFIG(accessibility)
-    Q_UNUSED(changed)
+    Q_UNUSED(changed);
 #else
     Q_Q(QQuickTextInput);
     if (changed && QAccessible::isActive()) {
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalrectanglenode_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalrectanglenode_p.h
index 125520de26..e39d013b49 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalrectanglenode_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalrectanglenode_p.h
@@ -71,7 +71,7 @@ public:
     void setGradientStops(const QGradientStops &stops) override;
     void setGradientVertical(bool vertical) override;
     void setRadius(qreal radius) override;
-    void setAntialiasing(bool antialiasing) override { Q_UNUSED(antialiasing) }
+    void setAntialiasing(bool antialiasing) override { Q_UNUSED(antialiasing); }
     void setAligned(bool aligned) override;
 
     void update() override;
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
index 8341f0dc57..249f9f9172 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
@@ -388,7 +388,7 @@ void qsg_dumpShadowRoots(Node *n)
 
     --indent;
 #else
-    Q_UNUSED(n)
+    Q_UNUSED(n);
 #endif
 }
 
diff --git a/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp b/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp
index 8bc9ded594..57faf0faad 100644
--- a/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp
+++ b/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp
@@ -165,7 +165,7 @@ void QSGNodeUpdater::leaveGeometryNode(QSGGeometryNode *g)
 #ifdef QSG_UPDATER_DEBUG
     qDebug() << "leave geometry" << g;
 #else
-    Q_UNUSED(g)
+    Q_UNUSED(g);
 #endif
 }
 
@@ -186,7 +186,7 @@ void QSGNodeUpdater::leaveRenderNode(QSGRenderNode *r)
 #ifdef QSG_UPDATER_DEBUG
     qDebug() << "leave render" << r;
 #else
-    Q_UNUSED(r)
+    Q_UNUSED(r);
 #endif
 }
 
diff --git a/src/quick/scenegraph/coreapi/qsgtexture.cpp b/src/quick/scenegraph/coreapi/qsgtexture.cpp
index 9daa8de37d..eebd5d1ab9 100644
--- a/src/quick/scenegraph/coreapi/qsgtexture.cpp
+++ b/src/quick/scenegraph/coreapi/qsgtexture.cpp
@@ -196,7 +196,7 @@ static void qt_debug_remove_texture(QSGTexture* texture)
         }
     }
 #else
-    Q_UNUSED(texture)
+    Q_UNUSED(texture);
 #endif
 
     --qt_debug_texture_count;
diff --git a/src/quick/scenegraph/qsgadaptationlayer_p.h b/src/quick/scenegraph/qsgadaptationlayer_p.h
index 512986556d..a59d11430e 100644
--- a/src/quick/scenegraph/qsgadaptationlayer_p.h
+++ b/src/quick/scenegraph/qsgadaptationlayer_p.h
@@ -142,7 +142,7 @@ public:
     virtual void setGradientStops(const QGradientStops &stops) = 0;
     virtual void setGradientVertical(bool vertical) = 0;
     virtual void setRadius(qreal radius) = 0;
-    virtual void setAntialiasing(bool antialiasing) { Q_UNUSED(antialiasing) }
+    virtual void setAntialiasing(bool antialiasing) { Q_UNUSED(antialiasing); }
     virtual void setAligned(bool aligned) = 0;
 
     virtual void update() = 0;
@@ -162,7 +162,7 @@ public:
     // in the inner source rect maps to the upper-left corner of the inner target rect.
     virtual void setSubSourceRect(const QRectF &rect) = 0;
     virtual void setTexture(QSGTexture *texture) = 0;
-    virtual void setAntialiasing(bool antialiasing) { Q_UNUSED(antialiasing) }
+    virtual void setAntialiasing(bool antialiasing) { Q_UNUSED(antialiasing); }
     virtual void setMirror(bool mirror) = 0;
     virtual void setMipmapFiltering(QSGTexture::Filtering filtering) = 0;
     virtual void setFiltering(QSGTexture::Filtering filtering) = 0;
diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
index 8388fa9576..c2c17508f1 100644
--- a/src/quick/scenegraph/qsgrenderloop.cpp
+++ b/src/quick/scenegraph/qsgrenderloop.cpp
@@ -131,7 +131,7 @@ void QSGRenderLoop::postJob(QQuickWindow *window, QRunnable *job)
         cd->rhi->makeThreadLocalNativeContextCurrent();
     job->run();
 #else
-    Q_UNUSED(window)
+    Q_UNUSED(window);
     job->run();
 #endif
     delete job;
diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp
index 2c20f1c76a..6896d3d3e4 100644
--- a/src/quick/util/qquickglobal.cpp
+++ b/src/quick/util/qquickglobal.cpp
@@ -167,7 +167,7 @@ class QQuickValueTypeProvider : public QQmlValueTypeProvider
 public:
 
 #if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS)
-    #define ASSERT_VALID_SIZE(size, min) Q_UNUSED(size)
+    #define ASSERT_VALID_SIZE(size, min) Q_UNUSED(size);
 #else
     #define ASSERT_VALID_SIZE(size, min) Q_ASSERT(size >= min)
 #endif