Add ; to Q_UNUSED

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

Task-number: QTBUG-82978
Change-Id: I2e126d0be8efa0aa89c4a91a681b549f38c8cec4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

12 files changed, 29 insertions, 29 deletions

diff --git a/tests/auto/animation/qchannelmapping/tst_qchannelmapping.cpp b/tests/auto/animation/qchannelmapping/tst_qchannelmapping.cpp
index 714fbdd90..1b7d2123c 100644
--- a/tests/auto/animation/qchannelmapping/tst_qchannelmapping.cpp
+++ b/tests/auto/animation/qchannelmapping/tst_qchannelmapping.cpp
@@ -257,8 +257,8 @@ private Q_SLOTS:
         QFETCH(int, expectedType);
         QFETCH(int, expectedComponentCount);
 
-        Q_UNUSED(expectedType)
-        Q_UNUSED(expectedComponentCount)
+        Q_UNUSED(expectedType);
+        Q_UNUSED(expectedComponentCount);
 
         TestArbiter arbiter;
         Qt3DAnimation::QChannelMapping mapping;
diff --git a/tests/auto/input/commons/testdevice.h b/tests/auto/input/commons/testdevice.h
index 61f39e4bf..a2ab4c1f8 100644
--- a/tests/auto/input/commons/testdevice.h
+++ b/tests/auto/input/commons/testdevice.h
@@ -47,8 +47,8 @@ public:
     int buttonCount() const final { return 0; }
     QStringList axisNames() const final { return QStringList(); }
     QStringList buttonNames() const final { return QStringList(); }
-    int axisIdentifier(const QString &name) const final { Q_UNUSED(name) return 0; }
-    int buttonIdentifier(const QString &name) const final { Q_UNUSED(name) return 0; }
+    int axisIdentifier(const QString &name) const final { Q_UNUSED(name); return 0; }
+    int buttonIdentifier(const QString &name) const final { Q_UNUSED(name); return 0; }
 
 private:
     friend class TestDeviceBackendNode;
diff --git a/tests/auto/render/commons/testrenderer.cpp b/tests/auto/render/commons/testrenderer.cpp
index a6687aac6..c61563ddb 100644
--- a/tests/auto/render/commons/testrenderer.cpp
+++ b/tests/auto/render/commons/testrenderer.cpp
@@ -38,7 +38,7 @@ TestRenderer::~TestRenderer()
 
 void TestRenderer::markDirty(Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet changes, Qt3DRender::Render::BackendNode *node)
 {
-    Q_UNUSED(node)
+    Q_UNUSED(node);
     m_changes |= changes;
 }
 
@@ -61,13 +61,13 @@ void TestRenderer::resetDirty()
 
 QVariant TestRenderer::executeCommand(const QStringList &args)
 {
-    Q_UNUSED(args)
+    Q_UNUSED(args);
     return QVariant();
 }
 
 void TestRenderer::setOffscreenSurfaceHelper(Qt3DRender::Render::OffscreenSurfaceHelper *helper)
 {
-    Q_UNUSED(helper)
+    Q_UNUSED(helper);
 }
 
 QSurfaceFormat TestRenderer::format()
diff --git a/tests/auto/render/commons/testrenderer.h b/tests/auto/render/commons/testrenderer.h
index 87c452ad8..d58448ffc 100644
--- a/tests/auto/render/commons/testrenderer.h
+++ b/tests/auto/render/commons/testrenderer.h
@@ -43,16 +43,16 @@ public:
     void dumpInfo() const override {}
     Qt3DRender::API api() const override { return Qt3DRender::API::OpenGL; }
     qint64 time() const override { return 0; }
-    void setTime(qint64 time) override { Q_UNUSED(time) }
+    void setTime(qint64 time) override { Q_UNUSED(time); }
     void setAspect(Qt3DRender::QRenderAspect *aspect) override { m_aspect = aspect; }
     void setNodeManagers(Qt3DRender::Render::NodeManagers *m) override
     {
         m_managers = m;
         m_resourceAccessor.reset(new Qt3DRender::Render::ResourceAccessor(this, m_managers));
     }
-    void setServices(Qt3DCore::QServiceLocator *services) override { Q_UNUSED(services) }
-    void setSurfaceExposed(bool exposed) override { Q_UNUSED(exposed) }
-    void setJobsInLastFrame(int jobsInLastFrame) override { Q_UNUSED(jobsInLastFrame) }
+    void setServices(Qt3DCore::QServiceLocator *services) override { Q_UNUSED(services); }
+    void setSurfaceExposed(bool exposed) override { Q_UNUSED(exposed); }
+    void setJobsInLastFrame(int jobsInLastFrame) override { Q_UNUSED(jobsInLastFrame); }
     Qt3DRender::QRenderAspect *aspect() const override { return m_aspect; }
     Qt3DRender::Render::NodeManagers *nodeManagers() const override { return m_managers; }
     Qt3DCore::QServiceLocator *services() const override { return nullptr; }
@@ -60,15 +60,15 @@ public:
     void shutdown() override {}
     void releaseGraphicsResources() override {}
     void render() override {}
-    void doRender(bool swapBuffers) override { Q_UNUSED(swapBuffers) }
+    void doRender(bool swapBuffers) override { Q_UNUSED(swapBuffers); }
     void cleanGraphicsResources() override {}
     bool isRunning() const override { return true; }
     bool shouldRender() const override { return true; }
     void skipNextFrame() override {}
-    void jobsDone(Qt3DCore::QAspectManager *manager) override { Q_UNUSED(manager) }
+    void jobsDone(Qt3DCore::QAspectManager *manager) override { Q_UNUSED(manager); }
     QVector<Qt3DCore::QAspectJobPtr> preRenderingJobs() override { return QVector<Qt3DCore::QAspectJobPtr>(); }
     QVector<Qt3DCore::QAspectJobPtr> renderBinJobs() override { return QVector<Qt3DCore::QAspectJobPtr>(); }
-    void setSceneRoot(Qt3DRender::Render::Entity *root) override { Q_UNUSED(root) }
+    void setSceneRoot(Qt3DRender::Render::Entity *root) override { Q_UNUSED(root); }
     Qt3DRender::Render::Entity *sceneRoot() const override { return nullptr; }
     Qt3DRender::Render::FrameGraphNode *frameGraphRoot() const override { return nullptr; }
     Qt3DCore::QAbstractFrameAdvanceService *frameAdvanceService() const override { return nullptr; }
diff --git a/tests/auto/render/layerfiltering/tst_layerfiltering.cpp b/tests/auto/render/layerfiltering/tst_layerfiltering.cpp
index 1ffec30ae..96e490752 100644
--- a/tests/auto/render/layerfiltering/tst_layerfiltering.cpp
+++ b/tests/auto/render/layerfiltering/tst_layerfiltering.cpp
@@ -148,7 +148,7 @@ private Q_SLOTS:
             Qt3DCore::QEntity *childEntity2 = new Qt3DCore::QEntity(rootEntity);
             Qt3DCore::QEntity *childEntity3 = new Qt3DCore::QEntity(rootEntity);
 
-            Q_UNUSED(childEntity1)
+            Q_UNUSED(childEntity1);
 
             Qt3DRender::QLayer *layer = new Qt3DRender::QLayer(rootEntity);
             Qt3DRender::QLayer *layer2 = new Qt3DRender::QLayer(rootEntity);
diff --git a/tests/auto/render/loadscenejob/tst_loadscenejob.cpp b/tests/auto/render/loadscenejob/tst_loadscenejob.cpp
index 7e75f1d69..39582121d 100644
--- a/tests/auto/render/loadscenejob/tst_loadscenejob.cpp
+++ b/tests/auto/render/loadscenejob/tst_loadscenejob.cpp
@@ -51,8 +51,8 @@ public:
 
     void setData(const QByteArray& data, const QString &basePath) override
     {
-        Q_UNUSED(data)
-        Q_UNUSED(basePath)
+        Q_UNUSED(data);
+        Q_UNUSED(basePath);
     }
 
     bool areFileTypesSupported(const QStringList &extensions) const override
diff --git a/tests/auto/render/picking/tst_picking.cpp b/tests/auto/render/picking/tst_picking.cpp
index 905ece958..f89463776 100644
--- a/tests/auto/render/picking/tst_picking.cpp
+++ b/tests/auto/render/picking/tst_picking.cpp
@@ -74,7 +74,7 @@ public:
         QSphereGeometry *g = static_cast<QSphereGeometry *>(mesh->geometry());
         QAttribute *positionAttr = static_cast<QAttribute *>(g->attributes().first());
         Qt3DCore::QBuffer *vertexBuffer = static_cast<Qt3DCore::QBuffer *>(positionAttr->buffer());
-        Q_UNUSED(vertexBuffer)
+        Q_UNUSED(vertexBuffer);
 
         transform->setTranslation(position);
 
diff --git a/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp b/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp
index 526f46243..bacf1ab98 100644
--- a/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp
+++ b/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp
@@ -559,7 +559,7 @@ private slots:
         QVERIFY(!Qt3DRender::Render::ShaderBuilder::getPrototypeNames().isEmpty());
         QFETCH(Qt3DRender::QShaderProgram::ShaderType, type);
         QFETCH(Qt3DRender::QShaderProgram::ShaderType, notificationType);
-        Q_UNUSED(notificationType)
+        Q_UNUSED(notificationType);
 
         const auto gl3Api = []{
             auto api = Qt3DRender::GraphicsApiFilterData();
diff --git a/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp b/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp
index 1ea4f1c8c..10deecd12 100644
--- a/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp
+++ b/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp
@@ -78,7 +78,7 @@ void benchmarkAllocateResources()
         for (int i = 0; i < max; i++)
             c = manager.getOrCreateResource(i);
     }
-    Q_UNUSED(c)
+    Q_UNUSED(c);
 }
 
 template<typename Resource>
@@ -95,7 +95,7 @@ void benchmarkAccessResources()
         for (int i = 0; i < max; i++)
             c = manager.data(handles[i]);
     }
-    Q_UNUSED(c)
+    Q_UNUSED(c);
 }
 
 template<typename Resource>
@@ -115,7 +115,7 @@ void benchmarkRandomAccessResource() {
         for (int i = 0; i < max; i++)
             c = manager.data(handles[i]);
     }
-    Q_UNUSED(c)
+    Q_UNUSED(c);
 }
 
 template<typename Resource>
@@ -131,7 +131,7 @@ void benchmarkLookupResources()
         for (int i = 0; i < max; i++)
             c = manager.lookupResource(i);
     }
-    Q_UNUSED(c)
+    Q_UNUSED(c);
 }
 
 template<typename Resource>
@@ -154,7 +154,7 @@ void benchmarkRandomLookupResources()
         for (int i = 0; i < max; i++)
             c = manager.lookupResource(resourcesIndices[i]);
     }
-    Q_UNUSED(c)
+    Q_UNUSED(c);
 }
 
 template<typename Resource>
diff --git a/tests/manual/rendercapture-qml-fbo/rendercaptureprovider.h b/tests/manual/rendercapture-qml-fbo/rendercaptureprovider.h
index d04dbd276..82095e1f6 100644
--- a/tests/manual/rendercapture-qml-fbo/rendercaptureprovider.h
+++ b/tests/manual/rendercapture-qml-fbo/rendercaptureprovider.h
@@ -72,8 +72,8 @@ public:
 
     virtual QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize)
     {
-        Q_UNUSED(id)
-        Q_UNUSED(requestedSize)
+        Q_UNUSED(id);
+        Q_UNUSED(requestedSize);
         *size = m_image.size();
         return m_image;
     }
diff --git a/tests/manual/rendercapture-qml/rendercaptureprovider.h b/tests/manual/rendercapture-qml/rendercaptureprovider.h
index d04dbd276..82095e1f6 100644
--- a/tests/manual/rendercapture-qml/rendercaptureprovider.h
+++ b/tests/manual/rendercapture-qml/rendercaptureprovider.h
@@ -72,8 +72,8 @@ public:
 
     virtual QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize)
     {
-        Q_UNUSED(id)
-        Q_UNUSED(requestedSize)
+        Q_UNUSED(id);
+        Q_UNUSED(requestedSize);
         *size = m_image.size();
         return m_image;
     }
diff --git a/tests/manual/rhi/main.cpp b/tests/manual/rhi/main.cpp
index 21617ac11..9c86110ba 100644
--- a/tests/manual/rhi/main.cpp
+++ b/tests/manual/rhi/main.cpp
@@ -272,7 +272,7 @@ int main(int argc, char* argv[])
         clearBuffer->setBuffers(Qt3DRender::QClearBuffers::ColorDepthBuffer);
         clearBuffer->setClearColor(QColor::fromRgbF(0.1, 0.5, 0.0, 1.0));
         auto *noDraw = new Qt3DRender::QNoDraw(clearBuffer);
-        Q_UNUSED(noDraw)
+        Q_UNUSED(noDraw);
 
         // RV 2
         auto *cameraSelector1 = new Qt3DRender::QCameraSelector(surfaceSelector);