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>

63 files changed, 183 insertions, 183 deletions

diff --git a/src/animation/backend/backendnode.cpp b/src/animation/backend/backendnode.cpp
index f44836a67..5f956d10d 100644
--- a/src/animation/backend/backendnode.cpp
+++ b/src/animation/backend/backendnode.cpp
@@ -69,7 +69,7 @@ void BackendNode::setDirty(Handler::DirtyFlag flag)
 
 void BackendNode::syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime)
 {
-    Q_UNUSED(firstTime)
+    Q_UNUSED(firstTime);
 
     d_ptr->setEnabled(frontEnd->isEnabled());
 }
diff --git a/src/core/aspect/qcoreaspect.cpp b/src/core/aspect/qcoreaspect.cpp
index dc3566edc..d120bab47 100644
--- a/src/core/aspect/qcoreaspect.cpp
+++ b/src/core/aspect/qcoreaspect.cpp
@@ -88,7 +88,7 @@ QAspectJobPtr QCoreAspect::calculateBoundingVolumeJob() const
 QVector<QAspectJobPtr> QCoreAspect::jobsToExecute(qint64 time)
 {
     Q_D(QCoreAspect);
-    Q_UNUSED(time)
+    Q_UNUSED(time);
 
     QVector<QAspectJobPtr> jobs;
 
@@ -105,7 +105,7 @@ QVector<QAspectJobPtr> QCoreAspect::jobsToExecute(qint64 time)
 
 QVariant QCoreAspect::executeCommand(const QStringList &args)
 {
-    Q_UNUSED(args)
+    Q_UNUSED(args);
     return {};
 }
 
diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp
index 3217d10b3..5eb5b5b1e 100644
--- a/src/core/aspects/qabstractaspect.cpp
+++ b/src/core/aspects/qabstractaspect.cpp
@@ -185,13 +185,13 @@ void QAbstractAspect::unregisterBackendType(const QMetaObject &obj)
 
 QVariant QAbstractAspect::executeCommand(const QStringList &args)
 {
-    Q_UNUSED(args)
+    Q_UNUSED(args);
     return QVariant();
 }
 
 QVector<QAspectJobPtr> QAbstractAspect::jobsToExecute(qint64 time)
 {
-    Q_UNUSED(time)
+    Q_UNUSED(time);
     return QVector<QAspectJobPtr>();
 }
 
diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp
index fa6cbac63..f4221cfe2 100644
--- a/src/core/aspects/qaspectmanager.cpp
+++ b/src/core/aspects/qaspectmanager.cpp
@@ -87,7 +87,7 @@ public:
     ~RequestFrameAnimation() override;
 
     int duration() const override { return 1; }
-    void updateCurrentTime(int currentTime) override { Q_UNUSED(currentTime) }
+    void updateCurrentTime(int currentTime) override { Q_UNUSED(currentTime); }
 };
 
 RequestFrameAnimation::~RequestFrameAnimation() = default;
diff --git a/src/core/geometry/buffervisitor_p.h b/src/core/geometry/buffervisitor_p.h
index 69cfb9b50..b1166555b 100644
--- a/src/core/geometry/buffervisitor_p.h
+++ b/src/core/geometry/buffervisitor_p.h
@@ -69,16 +69,16 @@ public:
     virtual ~BufferVisitor() = default;
 
     virtual void visit(uint ndx, ValueType x) {
-        Q_UNUSED(ndx) Q_UNUSED(x)
+        Q_UNUSED(ndx); Q_UNUSED(x);
     }
     virtual void visit(uint ndx, ValueType x, ValueType y) {
-        Q_UNUSED(ndx) Q_UNUSED(x) Q_UNUSED(y)
+        Q_UNUSED(ndx); Q_UNUSED(x); Q_UNUSED(y);
     }
     virtual void visit(uint ndx, ValueType x, ValueType y, ValueType z) {
-        Q_UNUSED(ndx) Q_UNUSED(x) Q_UNUSED(y) Q_UNUSED(z)
+        Q_UNUSED(ndx); Q_UNUSED(x); Q_UNUSED(y); Q_UNUSED(z);
     }
     virtual void visit(uint ndx, ValueType x, ValueType y, ValueType z, ValueType w) {
-        Q_UNUSED(ndx) Q_UNUSED(x) Q_UNUSED(y) Q_UNUSED(z) Q_UNUSED(w)
+        Q_UNUSED(ndx); Q_UNUSED(x); Q_UNUSED(y); Q_UNUSED(z); Q_UNUSED(w);
     }
 
     bool apply(QAttribute *attribute,
diff --git a/src/core/geometry/qgeometryview.cpp b/src/core/geometry/qgeometryview.cpp
index 7c1ab73ff..6effa1d28 100644
--- a/src/core/geometry/qgeometryview.cpp
+++ b/src/core/geometry/qgeometryview.cpp
@@ -114,7 +114,7 @@ public:
 
     void visit(uint ndx, float x, float y, float z) override
     {
-        Q_UNUSED(ndx)
+        Q_UNUSED(ndx);
         const Vector3D p = Vector3D(x, y, z);
 
         if (hasNoPoints && setReferencePoint) {
diff --git a/src/core/jobs/calcboundingvolumejob.cpp b/src/core/jobs/calcboundingvolumejob.cpp
index caac551cc..1c7028f23 100644
--- a/src/core/jobs/calcboundingvolumejob.cpp
+++ b/src/core/jobs/calcboundingvolumejob.cpp
@@ -281,7 +281,7 @@ void CalculateBoundingVolumeJob::run()
 
 void CalculateBoundingVolumeJob::postFrame(QAspectEngine *aspectEngine)
 {
-    Q_UNUSED(aspectEngine)
+    Q_UNUSED(aspectEngine);
 
     for (auto result: qAsConst(m_results)) {
         // set the results
diff --git a/src/core/jobs/qaspectjob.cpp b/src/core/jobs/qaspectjob.cpp
index 7c23f6894..22044ebaf 100644
--- a/src/core/jobs/qaspectjob.cpp
+++ b/src/core/jobs/qaspectjob.cpp
@@ -77,7 +77,7 @@ bool QAspectJobPrivate::isRequired() const
 
 void QAspectJobPrivate::postFrame(QAspectManager *aspectManager)
 {
-    Q_UNUSED(aspectManager)
+    Q_UNUSED(aspectManager);
 }
 
 QAspectJob::QAspectJob()
diff --git a/src/core/nodes/qbackendnode.cpp b/src/core/nodes/qbackendnode.cpp
index 4d15e1789..550d43411 100644
--- a/src/core/nodes/qbackendnode.cpp
+++ b/src/core/nodes/qbackendnode.cpp
@@ -75,22 +75,22 @@ QBackendNodePrivate *QBackendNodePrivate::get(QBackendNode *n)
 
 void QBackendNodePrivate::addedToEntity(QNode *frontend)
 {
-    Q_UNUSED(frontend)
+    Q_UNUSED(frontend);
 }
 
 void QBackendNodePrivate::removedFromEntity(QNode *frontend)
 {
-    Q_UNUSED(frontend)
+    Q_UNUSED(frontend);
 }
 
 void QBackendNodePrivate::componentAdded(QNode *frontend)
 {
-    Q_UNUSED(frontend)
+    Q_UNUSED(frontend);
 }
 
 void QBackendNodePrivate::componentRemoved(QNode *frontend)
 {
-    Q_UNUSED(frontend)
+    Q_UNUSED(frontend);
 }
 
 /*!
@@ -199,8 +199,8 @@ QBackendNode::Mode QBackendNode::mode() const Q_DECL_NOTHROW
  */
 void QBackendNode::syncFromFrontEnd(const QNode *frontEnd, bool firstTime)
 {
-    Q_UNUSED(frontEnd)
-    Q_UNUSED(firstTime)
+    Q_UNUSED(frontEnd);
+    Q_UNUSED(firstTime);
 }
 
 /*!
diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp
index 4e2a3349f..e9665874d 100644
--- a/src/core/nodes/qnode.cpp
+++ b/src/core/nodes/qnode.cpp
@@ -360,7 +360,7 @@ void QNodePrivate::unregisterNotifiedProperties()
 
 void QNodePrivate::propertyChanged(int propertyIndex)
 {
-    Q_UNUSED(propertyIndex)
+    Q_UNUSED(propertyIndex);
 
     // Bail out early if we can to avoid the cost below
     if (m_blockNotifications)
@@ -523,8 +523,8 @@ QScene *QNodePrivate::scene() const
  */
 void QNodePrivate::notifyPropertyChange(const char *name, const QVariant &value)
 {
-    Q_UNUSED(name)
-    Q_UNUSED(value)
+    Q_UNUSED(name);
+    Q_UNUSED(value);
 
     // Bail out early if we can to avoid operator new
     if (m_blockNotifications)
@@ -535,8 +535,8 @@ void QNodePrivate::notifyPropertyChange(const char *name, const QVariant &value)
 
 void QNodePrivate::notifyDynamicPropertyChange(const QByteArray &name, const QVariant &value)
 {
-    Q_UNUSED(name)
-    Q_UNUSED(value)
+    Q_UNUSED(name);
+    Q_UNUSED(value);
 
     // Bail out early if we can to avoid operator new
     if (m_blockNotifications)
diff --git a/src/input/backend/actioninput.cpp b/src/input/backend/actioninput.cpp
index b02da0a4d..805fde1cf 100644
--- a/src/input/backend/actioninput.cpp
+++ b/src/input/backend/actioninput.cpp
@@ -77,7 +77,7 @@ void ActionInput::syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTi
 
 bool ActionInput::process(InputHandler *inputHandler, qint64 currentTime)
 {
-    Q_UNUSED(currentTime)
+    Q_UNUSED(currentTime);
 
     if (!isEnabled())
         return false;
diff --git a/src/input/backend/backendnode.cpp b/src/input/backend/backendnode.cpp
index aa440ed51..700f9c09f 100644
--- a/src/input/backend/backendnode.cpp
+++ b/src/input/backend/backendnode.cpp
@@ -63,7 +63,7 @@ BackendNode::~BackendNode()
 
 void BackendNode::syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime)
 {
-    Q_UNUSED(firstTime)
+    Q_UNUSED(firstTime);
 
     d_ptr->setEnabled(frontEnd->isEnabled());
 }
diff --git a/src/input/backend/keyboardeventfilter.cpp b/src/input/backend/keyboardeventfilter.cpp
index 53168e601..e4f47f08e 100644
--- a/src/input/backend/keyboardeventfilter.cpp
+++ b/src/input/backend/keyboardeventfilter.cpp
@@ -65,7 +65,7 @@ void KeyboardEventFilter::setInputHandler(InputHandler *handler)
 // Triggered in the view thread (usually the main thread)
 bool KeyboardEventFilter::eventFilter(QObject *obj, QEvent *e)
 {
-    Q_UNUSED(obj)
+    Q_UNUSED(obj);
     if (e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease) {
         // Store event to be processed later on in an InputAspect job
         m_inputHandler->appendKeyEvent(QT_PREPEND_NAMESPACE(QKeyEvent)(*static_cast<QT_PREPEND_NAMESPACE(QKeyEvent) *>(e)));
diff --git a/src/input/backend/keyboardmousegenericdeviceintegration.cpp b/src/input/backend/keyboardmousegenericdeviceintegration.cpp
index 05430b0e8..27da019af 100644
--- a/src/input/backend/keyboardmousegenericdeviceintegration.cpp
+++ b/src/input/backend/keyboardmousegenericdeviceintegration.cpp
@@ -64,13 +64,13 @@ void KeyboardMouseGenericDeviceIntegration::onInitialize()
 
 QVector<Qt3DCore::QAspectJobPtr> KeyboardMouseGenericDeviceIntegration::jobsToExecute(qint64 time)
 {
-    Q_UNUSED(time)
+    Q_UNUSED(time);
     return QVector<Qt3DCore::QAspectJobPtr>();
 }
 
 QAbstractPhysicalDevice *KeyboardMouseGenericDeviceIntegration::createPhysicalDevice(const QString &name)
 {
-    Q_UNUSED(name)
+    Q_UNUSED(name);
     return nullptr;
 }
 
diff --git a/src/input/frontend/qinputdeviceplugin.cpp b/src/input/frontend/qinputdeviceplugin.cpp
index cae80c05b..6ac8b3a0c 100644
--- a/src/input/frontend/qinputdeviceplugin.cpp
+++ b/src/input/frontend/qinputdeviceplugin.cpp
@@ -54,8 +54,8 @@ QInputDevicePlugin::~QInputDevicePlugin()
 
 QInputDeviceIntegration *QInputDevicePlugin::create(const QString &key, const QStringList &paramList)
 {
-    Q_UNUSED(key)
-    Q_UNUSED(paramList)
+    Q_UNUSED(key);
+    Q_UNUSED(paramList);
     return nullptr;
 }
 
diff --git a/src/logic/handler.cpp b/src/logic/handler.cpp
index be6d03c3d..009d87be4 100644
--- a/src/logic/handler.cpp
+++ b/src/logic/handler.cpp
@@ -56,7 +56,7 @@ Handler::Handler()
 
 void Handler::syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime)
 {
-    Q_UNUSED(frontEnd)
+    Q_UNUSED(frontEnd);
     if (firstTime)
         m_logicManager->appendHandler(this);
 }
diff --git a/src/plugins/renderers/opengl/debug/imguirenderer.cpp b/src/plugins/renderers/opengl/debug/imguirenderer.cpp
index 56f9ee0b5..eb679f36c 100644
--- a/src/plugins/renderers/opengl/debug/imguirenderer.cpp
+++ b/src/plugins/renderers/opengl/debug/imguirenderer.cpp
@@ -147,11 +147,11 @@ ImGuiRenderer::ImGuiRenderer(Qt3DRender::Render::OpenGL::Renderer *renderer)
 
 #ifndef QT_NO_CLIPBOARD
     io.SetClipboardTextFn = [](void *user_data, const char *text) {
-        Q_UNUSED(user_data)
+        Q_UNUSED(user_data);
         QGuiApplication::clipboard()->setText(QString::fromLatin1(text));
     };
     io.GetClipboardTextFn = [](void *user_data) {
-        Q_UNUSED(user_data)
+        Q_UNUSED(user_data);
         g_currentClipboardText = QGuiApplication::clipboard()->text().toUtf8();
         return static_cast<const char *>(g_currentClipboardText.data());
     };
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2.cpp b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2.cpp
index 72cee57a4..ef41f1770 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2.cpp
@@ -302,7 +302,7 @@ void GraphicsHelperES2::vertexAttributePointer(GLenum shaderDataType,
 
 void GraphicsHelperES2::readBuffer(GLenum mode)
 {
-    Q_UNUSED(mode)
+    Q_UNUSED(mode);
     static bool showWarning = true;
     if (!showWarning)
         return;
@@ -443,7 +443,7 @@ void GraphicsHelperES2::releaseFrameBufferObject(GLuint frameBufferId)
 
 void GraphicsHelperES2::bindFrameBufferObject(GLuint frameBufferId, FBOBindMode mode)
 {
-    Q_UNUSED(mode)
+    Q_UNUSED(mode);
     // For ES2 the spec states for target: The symbolic constant must be GL_FRAMEBUFFER
     // so mode is ignored and is always set to GL_FRAMEBUFFER
     m_funcs->glBindFramebuffer(GL_FRAMEBUFFER, frameBufferId);
@@ -453,13 +453,13 @@ void GraphicsHelperES2::bindImageTexture(GLuint imageUnit, GLuint texture,
                                          GLint mipLevel, GLboolean layered,
                                          GLint layer, GLenum access, GLenum format)
 {
-    Q_UNUSED(imageUnit)
-    Q_UNUSED(texture)
-    Q_UNUSED(mipLevel)
-    Q_UNUSED(layered)
-    Q_UNUSED(layer)
-    Q_UNUSED(access)
-    Q_UNUSED(format)
+    Q_UNUSED(imageUnit);
+    Q_UNUSED(texture);
+    Q_UNUSED(mipLevel);
+    Q_UNUSED(layered);
+    Q_UNUSED(layer);
+    Q_UNUSED(access);
+    Q_UNUSED(format);
     qWarning() << "Shader Images are not supported by ES 2.0 (since ES 3.1)";
 
 }
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl2.cpp b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl2.cpp
index 01a84fd88..120e9e655 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl2.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl2.cpp
@@ -470,13 +470,13 @@ void GraphicsHelperGL2::bindImageTexture(GLuint imageUnit, GLuint texture,
                                          GLint mipLevel, GLboolean layered,
                                          GLint layer, GLenum access, GLenum format)
 {
-    Q_UNUSED(imageUnit)
-    Q_UNUSED(texture)
-    Q_UNUSED(mipLevel)
-    Q_UNUSED(layered)
-    Q_UNUSED(layer)
-    Q_UNUSED(access)
-    Q_UNUSED(format)
+    Q_UNUSED(imageUnit);
+    Q_UNUSED(texture);
+    Q_UNUSED(mipLevel);
+    Q_UNUSED(layered);
+    Q_UNUSED(layer);
+    Q_UNUSED(access);
+    Q_UNUSED(format);
     qWarning() << "Shader Images are not supported by OpenGL 2.0 (since OpenGL 4.2)";
 
 }
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_2.cpp b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_2.cpp
index 6494a3dc6..4b82af0ba 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_2.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_2.cpp
@@ -83,11 +83,11 @@ GraphicsHelperGL3_2::~GraphicsHelperGL3_2()
 void GraphicsHelperGL3_2::initializeHelper(QOpenGLContext *context,
                                            QAbstractOpenGLFunctions *functions)
 {
-    Q_UNUSED(context)
+    Q_UNUSED(context);
     m_funcs = static_cast<QOpenGLFunctions_3_2_Core*>(functions);
     const bool ok = m_funcs->initializeOpenGLFunctions();
     Q_ASSERT(ok);
-    Q_UNUSED(ok)
+    Q_UNUSED(ok);
 }
 
 void GraphicsHelperGL3_2::drawElementsInstancedBaseVertexBaseInstance(GLenum primitiveType,
@@ -452,13 +452,13 @@ void GraphicsHelperGL3_2::bindImageTexture(GLuint imageUnit, GLuint texture,
                                            GLint mipLevel, GLboolean layered,
                                            GLint layer, GLenum access, GLenum format)
 {
-    Q_UNUSED(imageUnit)
-    Q_UNUSED(texture)
-    Q_UNUSED(mipLevel)
-    Q_UNUSED(layered)
-    Q_UNUSED(layer)
-    Q_UNUSED(access)
-    Q_UNUSED(format)
+    Q_UNUSED(imageUnit);
+    Q_UNUSED(texture);
+    Q_UNUSED(mipLevel);
+    Q_UNUSED(layered);
+    Q_UNUSED(layer);
+    Q_UNUSED(access);
+    Q_UNUSED(format);
     qWarning() << "Shader Images are not supported by OpenGL 3.2 (since OpenGL 4.2)";
 
 }
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_3.cpp b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_3.cpp
index cb992293a..6aaa2d7ff 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_3.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_3.cpp
@@ -82,11 +82,11 @@ GraphicsHelperGL3_3::~GraphicsHelperGL3_3()
 void GraphicsHelperGL3_3::initializeHelper(QOpenGLContext *context,
                                             QAbstractOpenGLFunctions *functions)
 {
-    Q_UNUSED(context)
+    Q_UNUSED(context);
     m_funcs = static_cast<QOpenGLFunctions_3_3_Core*>(functions);
     const bool ok = m_funcs->initializeOpenGLFunctions();
     Q_ASSERT(ok);
-    Q_UNUSED(ok)
+    Q_UNUSED(ok);
 }
 
 void GraphicsHelperGL3_3::drawElementsInstancedBaseVertexBaseInstance(GLenum primitiveType,
@@ -544,13 +544,13 @@ void GraphicsHelperGL3_3::bindImageTexture(GLuint imageUnit, GLuint texture,
                                            GLint mipLevel, GLboolean layered,
                                            GLint layer, GLenum access, GLenum format)
 {
-    Q_UNUSED(imageUnit)
-    Q_UNUSED(texture)
-    Q_UNUSED(mipLevel)
-    Q_UNUSED(layered)
-    Q_UNUSED(layer)
-    Q_UNUSED(access)
-    Q_UNUSED(format)
+    Q_UNUSED(imageUnit);
+    Q_UNUSED(texture);
+    Q_UNUSED(mipLevel);
+    Q_UNUSED(layered);
+    Q_UNUSED(layer);
+    Q_UNUSED(access);
+    Q_UNUSED(format);
     qWarning() << "Shader Images are not supported by OpenGL 3.3 (since OpenGL 4.2)";
 }
 
diff --git a/src/plugins/renderers/opengl/jobs/materialparametergathererjob.cpp b/src/plugins/renderers/opengl/jobs/materialparametergathererjob.cpp
index 932baf685..6bc4bf580 100644
--- a/src/plugins/renderers/opengl/jobs/materialparametergathererjob.cpp
+++ b/src/plugins/renderers/opengl/jobs/materialparametergathererjob.cpp
@@ -79,7 +79,7 @@ bool MaterialParameterGathererJobPrivate::isRequired() const
 
 void MaterialParameterGathererJobPrivate::postFrame(Qt3DCore::QAspectManager *manager)
 {
-    Q_UNUSED(manager)
+    Q_UNUSED(manager);
     materialParameterGathererCounter = 0;
 }
 
diff --git a/src/plugins/renderers/opengl/jobs/renderviewcommandbuilderjob.cpp b/src/plugins/renderers/opengl/jobs/renderviewcommandbuilderjob.cpp
index d5e17e0bf..9f253caa3 100644
--- a/src/plugins/renderers/opengl/jobs/renderviewcommandbuilderjob.cpp
+++ b/src/plugins/renderers/opengl/jobs/renderviewcommandbuilderjob.cpp
@@ -73,7 +73,7 @@ bool RenderViewCommandBuilderJobPrivate::isRequired() const
 
 void RenderViewCommandBuilderJobPrivate::postFrame(Qt3DCore::QAspectManager *manager)
 {
-    Q_UNUSED(manager)
+    Q_UNUSED(manager);
     renderViewInstanceCounter = 0;
 }
 
diff --git a/src/plugins/renderers/opengl/jobs/renderviewcommandupdaterjob.cpp b/src/plugins/renderers/opengl/jobs/renderviewcommandupdaterjob.cpp
index 0c84fde9e..2cff31866 100644
--- a/src/plugins/renderers/opengl/jobs/renderviewcommandupdaterjob.cpp
+++ b/src/plugins/renderers/opengl/jobs/renderviewcommandupdaterjob.cpp
@@ -75,7 +75,7 @@ bool RenderViewCommandUpdaterJobPrivate::isRequired() const
 
 void RenderViewCommandUpdaterJobPrivate::postFrame(Qt3DCore::QAspectManager *manager)
 {
-    Q_UNUSED(manager)
+    Q_UNUSED(manager);
 
     // reset to 0 after every frame, stops the number growing indefinitely
     renderViewInstanceCounter = 0;
diff --git a/src/plugins/renderers/opengl/main.cpp b/src/plugins/renderers/opengl/main.cpp
index 7f97ead1d..7f982ef8e 100644
--- a/src/plugins/renderers/opengl/main.cpp
+++ b/src/plugins/renderers/opengl/main.cpp
@@ -49,7 +49,7 @@ class OpenGLRendererPlugin : public Qt3DRender::Render::QRendererPlugin
 
     Qt3DRender::Render::AbstractRenderer *create(const QString &key) override
     {
-        Q_UNUSED(key)
+        Q_UNUSED(key);
         return new Qt3DRender::Render::OpenGL::Renderer();
     }
 };
diff --git a/src/plugins/renderers/opengl/renderer/commandexecuter.cpp b/src/plugins/renderers/opengl/renderer/commandexecuter.cpp
index fe349d015..c99f69fd3 100644
--- a/src/plugins/renderers/opengl/renderer/commandexecuter.cpp
+++ b/src/plugins/renderers/opengl/renderer/commandexecuter.cpp
@@ -67,7 +67,7 @@ QJsonObject typeToJsonObj(const Type &)
 template<typename Type>
 QJsonValue typeToJsonValue(const Type &t)
 {
-    Q_UNUSED(t)
+    Q_UNUSED(t);
     return QJsonValue();
 }
 
diff --git a/src/plugins/renderers/opengl/renderer/renderer.cpp b/src/plugins/renderers/opengl/renderer/renderer.cpp
index effc57681..40d453b13 100644
--- a/src/plugins/renderers/opengl/renderer/renderer.cpp
+++ b/src/plugins/renderers/opengl/renderer/renderer.cpp
@@ -1735,7 +1735,7 @@ Renderer::ViewSubmissionResultData Renderer::submitRenderViews(const QVector<Ren
 
 void Renderer::markDirty(BackendNodeDirtySet changes, BackendNode *node)
 {
-    Q_UNUSED(node)
+    Q_UNUSED(node);
     m_dirtyBits.marked |= changes;
 }
 
diff --git a/src/plugins/renderers/opengl/renderer/renderview.cpp b/src/plugins/renderers/opengl/renderer/renderview.cpp
index 5e4278bb8..70e3707c3 100644
--- a/src/plugins/renderers/opengl/renderer/renderview.cpp
+++ b/src/plugins/renderers/opengl/renderer/renderview.cpp
@@ -331,9 +331,9 @@ struct SubRangeSorter
 {
     static void sortSubRange(EntityRenderCommandDataView *view, size_t begin, const size_t end)
     {
-        Q_UNUSED(view)
-        Q_UNUSED(begin)
-        Q_UNUSED(end)
+        Q_UNUSED(view);
+        Q_UNUSED(begin);
+        Q_UNUSED(end);
         Q_UNREACHABLE();
     }
 };
diff --git a/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp b/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp
index 5c2c31133..c69668d3f 100644
--- a/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp
+++ b/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp
@@ -164,8 +164,8 @@ namespace {
 template<typename GenericState>
 void applyStateHelper(const GenericState *state, QRhiGraphicsPipeline *gp) noexcept
 {
-    Q_UNUSED(state)
-    Q_UNUSED(gp)
+    Q_UNUSED(state);
+    Q_UNUSED(gp);
     qWarning() << "RHI Unhandled render state" << typeid(GenericState).name();
 }
 
@@ -270,7 +270,7 @@ void applyStateHelper(const BlendEquation *state, QRhiGraphicsPipeline *gp) noex
 void applyStateHelper(const MSAAEnabled *state, QRhiGraphicsPipeline *gp,
                       const QSurfaceFormat &format) noexcept
 {
-    Q_UNUSED(state)
+    Q_UNUSED(state);
     gp->setSampleCount(format.samples());
 }
 
@@ -690,7 +690,7 @@ bool SubmissionContext::beginDrawing(QSurface *surface)
 
 void SubmissionContext::endDrawing(bool swapBuffers)
 {
-    Q_UNUSED(swapBuffers)
+    Q_UNUSED(swapBuffers);
     m_rhi->endFrame(m_currentSwapChain, {});
 
     RHI_UNIMPLEMENTED;
@@ -734,8 +734,8 @@ void SubmissionContext::activateRenderTarget(Qt3DCore::QNodeId renderTargetNodeI
 GLuint SubmissionContext::createRenderTarget(Qt3DCore::QNodeId renderTargetNodeId,
                                              const AttachmentPack &attachments)
 {
-    Q_UNUSED(renderTargetNodeId)
-    Q_UNUSED(attachments)
+    Q_UNUSED(renderTargetNodeId);
+    Q_UNUSED(attachments);
     RHI_UNIMPLEMENTED;
     return 0;
     //*    const GLuint fboId = m_glHelper->createFrameBufferObject();
@@ -756,9 +756,9 @@ GLuint SubmissionContext::updateRenderTarget(Qt3DCore::QNodeId renderTargetNodeI
                                              const AttachmentPack &attachments,
                                              bool isActiveRenderTarget)
 {
-    Q_UNUSED(renderTargetNodeId)
-    Q_UNUSED(attachments)
-    Q_UNUSED(isActiveRenderTarget)
+    Q_UNUSED(renderTargetNodeId);
+    Q_UNUSED(attachments);
+    Q_UNUSED(isActiveRenderTarget);
     RHI_UNIMPLEMENTED;
     return 0;
     //*    const GLuint fboId = m_renderTargets.value(renderTargetNodeId);
@@ -842,7 +842,7 @@ QSize SubmissionContext::renderTargetSize(const QSize &surfaceSize) const
 
 QImage SubmissionContext::readFramebuffer(const QRect &rect)
 {
-    Q_UNUSED(rect)
+    Q_UNUSED(rect);
     RHI_UNIMPLEMENTED;
     return {};
     //*    QImage img;
@@ -1030,7 +1030,7 @@ void SubmissionContext::releaseResources()
 // Called only from RenderThread
 bool SubmissionContext::activateShader(RHIShader *shader)
 {
-    Q_UNUSED(shader)
+    Q_UNUSED(shader);
     RHI_UNIMPLEMENTED;
     //* if (shader->shaderProgram() != m_activeShader) {
     //*     // Ensure material uniforms are re-applied
@@ -1051,8 +1051,8 @@ bool SubmissionContext::activateShader(RHIShader *shader)
 void SubmissionContext::bindFrameBufferAttachmentHelper(GLuint fboId,
                                                         const AttachmentPack &attachments)
 {
-    Q_UNUSED(fboId)
-    Q_UNUSED(attachments)
+    Q_UNUSED(fboId);
+    Q_UNUSED(attachments);
     RHI_UNIMPLEMENTED;
     // Set FBO attachments. These are normally textures, except that on Open GL
     // ES <= 3.1 we must use a renderbuffer if a combined depth+stencil is
@@ -1095,7 +1095,7 @@ void SubmissionContext::bindFrameBufferAttachmentHelper(GLuint fboId,
 
 void SubmissionContext::activateDrawBuffers(const AttachmentPack &attachments)
 {
-    Q_UNUSED(attachments)
+    Q_UNUSED(attachments);
     RHI_UNIMPLEMENTED;
     //* const QVector<int> activeDrawBuffers = attachments.getGlDrawBuffers();
     //*
@@ -1578,14 +1578,14 @@ void SubmissionContext::blitFramebuffer(Qt3DCore::QNodeId inputRenderTargetId,
                                         QRenderTargetOutput::AttachmentPoint outputAttachmentPoint,
                                         QBlitFramebuffer::InterpolationMethod interpolationMethod)
 {
-    Q_UNUSED(inputRenderTargetId)
-    Q_UNUSED(outputRenderTargetId)
-    Q_UNUSED(inputRect)
-    Q_UNUSED(outputRect)
-    Q_UNUSED(defaultFboId)
-    Q_UNUSED(inputAttachmentPoint)
-    Q_UNUSED(outputAttachmentPoint)
-    Q_UNUSED(interpolationMethod)
+    Q_UNUSED(inputRenderTargetId);
+    Q_UNUSED(outputRenderTargetId);
+    Q_UNUSED(inputRect);
+    Q_UNUSED(outputRect);
+    Q_UNUSED(defaultFboId);
+    Q_UNUSED(inputAttachmentPoint);
+    Q_UNUSED(outputAttachmentPoint);
+    Q_UNUSED(interpolationMethod);
     RHI_UNIMPLEMENTED;
     //*    GLuint inputFboId = defaultFboId;
     //*    bool inputBufferIsDefault = true;
diff --git a/src/plugins/renderers/rhi/io/rhibuffer.cpp b/src/plugins/renderers/rhi/io/rhibuffer.cpp
index 8ccd1f6f7..ba29e8ac9 100644
--- a/src/plugins/renderers/rhi/io/rhibuffer.cpp
+++ b/src/plugins/renderers/rhi/io/rhibuffer.cpp
@@ -117,7 +117,7 @@ bool RHIBuffer::bind(SubmissionContext *ctx, Type t)
 
 bool RHIBuffer::release(SubmissionContext *ctx)
 {
-    Q_UNUSED(ctx)
+    Q_UNUSED(ctx);
     if (m_rhiBuffer)
         m_rhiBuffer->destroy();
     return true;
@@ -125,13 +125,13 @@ bool RHIBuffer::release(SubmissionContext *ctx)
 
 bool RHIBuffer::create(SubmissionContext *ctx)
 {
-    Q_UNUSED(ctx)
+    Q_UNUSED(ctx);
     return true;
 }
 
 void RHIBuffer::destroy(SubmissionContext *ctx)
 {
-    Q_UNUSED(ctx)
+    Q_UNUSED(ctx);
     if (m_rhiBuffer) {
         m_rhiBuffer->deleteLater();
         m_rhiBuffer = nullptr;
@@ -151,7 +151,7 @@ void RHIBuffer::orphan(SubmissionContext *)
 
 void RHIBuffer::allocate(SubmissionContext *ctx, const QByteArray &data, bool dynamic)
 {
-    Q_UNUSED(ctx)
+    Q_UNUSED(ctx);
     m_datasToUpload.clear();
     m_datasToUpload.push_back({ data, 0 });
     m_allocSize = data.size();
@@ -160,14 +160,14 @@ void RHIBuffer::allocate(SubmissionContext *ctx, const QByteArray &data, bool dy
 
 void RHIBuffer::update(SubmissionContext *ctx, const QByteArray &data, int offset)
 {
-    Q_UNUSED(ctx)
+    Q_UNUSED(ctx);
     m_datasToUpload.push_back({ data, offset });
 }
 
 QByteArray RHIBuffer::download(SubmissionContext *ctx, uint size)
 {
-    Q_UNUSED(ctx)
-    Q_UNUSED(size)
+    Q_UNUSED(ctx);
+    Q_UNUSED(size);
     RHI_UNIMPLEMENTED;
     //    char *gpu_ptr = ctx->mapBuffer(m_lastTarget, size);
     //    QByteArray data;
@@ -182,17 +182,17 @@ QByteArray RHIBuffer::download(SubmissionContext *ctx, uint size)
 
 void RHIBuffer::bindBufferBase(SubmissionContext *ctx, int bindingPoint, RHIBuffer::Type t)
 {
-    Q_UNUSED(ctx)
-    Q_UNUSED(bindingPoint)
-    Q_UNUSED(t)
+    Q_UNUSED(ctx);
+    Q_UNUSED(bindingPoint);
+    Q_UNUSED(t);
     RHI_UNIMPLEMENTED;
     //    ctx->bindBufferBase(glBufferTypes[t], bindingPoint, m_bufferId);
 }
 
 void RHIBuffer::bindBufferBase(SubmissionContext *ctx, int bindingPoint)
 {
-    Q_UNUSED(ctx)
-    Q_UNUSED(bindingPoint)
+    Q_UNUSED(ctx);
+    Q_UNUSED(bindingPoint);
     RHI_UNIMPLEMENTED;
     //    ctx->bindBufferBase(m_lastTarget, bindingPoint, m_bufferId);
 }
diff --git a/src/plugins/renderers/rhi/jobs/renderviewcommandupdaterjob.cpp b/src/plugins/renderers/rhi/jobs/renderviewcommandupdaterjob.cpp
index e243e07dd..334b0cc6b 100644
--- a/src/plugins/renderers/rhi/jobs/renderviewcommandupdaterjob.cpp
+++ b/src/plugins/renderers/rhi/jobs/renderviewcommandupdaterjob.cpp
@@ -76,7 +76,7 @@ bool RenderViewCommandUpdaterJobPrivate::isRequired() const
 
 void RenderViewCommandUpdaterJobPrivate::postFrame(Qt3DCore::QAspectManager *manager)
 {
-    Q_UNUSED(manager)
+    Q_UNUSED(manager);
 
     // reset to 0 after every frame, stops the number growing indefinitely
     renderViewInstanceCounter = 0;
diff --git a/src/plugins/renderers/rhi/main.cpp b/src/plugins/renderers/rhi/main.cpp
index 36adae97d..174b385de 100644
--- a/src/plugins/renderers/rhi/main.cpp
+++ b/src/plugins/renderers/rhi/main.cpp
@@ -50,7 +50,7 @@ class RhiRendererPlugin : public Qt3DRender::Render::QRendererPlugin
     Qt3DRender::Render::AbstractRenderer *
     create(const QString &key) override
     {
-        Q_UNUSED(key)
+        Q_UNUSED(key);
         return new Qt3DRender::Render::Rhi::Renderer();
     }
 };
diff --git a/src/plugins/renderers/rhi/renderer/commandexecuter.cpp b/src/plugins/renderers/rhi/renderer/commandexecuter.cpp
index 08b51da79..d4fdf3a6d 100644
--- a/src/plugins/renderers/rhi/renderer/commandexecuter.cpp
+++ b/src/plugins/renderers/rhi/renderer/commandexecuter.cpp
@@ -303,7 +303,7 @@ CommandExecuter::CommandExecuter(Render::Rhi::Renderer *renderer) : m_renderer(r
 void CommandExecuter::performAsynchronousCommandExecution(
         const QVector<Render::Rhi::RenderView *> &views)
 {
-    Q_UNUSED(views)
+    Q_UNUSED(views);
     RHI_UNIMPLEMENTED;
     //*    QMutexLocker lock(&m_pendingCommandsMutex);
     //*    const QVector<Qt3DCore::Debug::AsynchronousCommandReply *> shellCommands =
@@ -381,7 +381,7 @@ void CommandExecuter::performAsynchronousCommandExecution(
 // Main thread
 QVariant CommandExecuter::executeCommand(const QStringList &args)
 {
-    Q_UNUSED(args)
+    Q_UNUSED(args);
     RHI_UNIMPLEMENTED;
     //*    // Note: The replies will be deleted by the AspectCommandDebugger
     //*    if (args.length() > 0 &&
diff --git a/src/plugins/renderers/rhi/renderer/renderer.cpp b/src/plugins/renderers/rhi/renderer/renderer.cpp
index 24a743f9d..b62079cba 100644
--- a/src/plugins/renderers/rhi/renderer/renderer.cpp
+++ b/src/plugins/renderers/rhi/renderer/renderer.cpp
@@ -384,7 +384,7 @@ QOpenGLContext *Renderer::shareContext() const
 // Executed in the reloadDirtyShader job
 void Renderer::loadShader(Shader *shader, HShader shaderHandle)
 {
-    Q_UNUSED(shader)
+    Q_UNUSED(shader);
     if (!m_dirtyShaders.contains(shaderHandle))
         m_dirtyShaders.push_back(shaderHandle);
 }
@@ -408,7 +408,7 @@ bool Renderer::accessOpenGLTexture(Qt3DCore::QNodeId nodeId, QOpenGLTexture **te
                                    QMutex **lock, bool readonly)
 {
     RHI_UNIMPLEMENTED;
-    Q_UNUSED(texture)
+    Q_UNUSED(texture);
 
     Texture *tex = m_nodesManager->textureManager()->lookupResource(nodeId);
     if (!tex)
@@ -1858,7 +1858,7 @@ Renderer::submitRenderViews(const QVector<RHIPassInfo> &rhiPassesInfo)
 
 void Renderer::markDirty(BackendNodeDirtySet changes, BackendNode *node)
 {
-    Q_UNUSED(node)
+    Q_UNUSED(node);
     m_dirtyBits.marked |= changes;
 }
 
@@ -2103,7 +2103,7 @@ void Renderer::performDraw(RenderCommand *command)
 void Renderer::performCompute(const RenderView *, RenderCommand *command)
 {
     RHI_UNIMPLEMENTED;
-    Q_UNUSED(command)
+    Q_UNUSED(command);
     //* {
     //*     RHIShader *shader =
     //m_RHIResourceManagers->rhiShaderManager()->lookupResource(command->m_shaderId);
@@ -2142,8 +2142,8 @@ static auto rhiIndexFormat(QAttribute::VertexBaseType type)
 bool Renderer::uploadBuffersForCommand(QRhiCommandBuffer *cb, const RenderView *rv,
                                        RenderCommand &command)
 {
-    Q_UNUSED(cb)
-    Q_UNUSED(rv)
+    Q_UNUSED(cb);
+    Q_UNUSED(rv);
     RHIGraphicsPipeline *graphicsPipeline = command.pipeline;
     if (!graphicsPipeline)
         return true;
@@ -2269,7 +2269,7 @@ void uploadUniform(SubmissionContext &submissionContext, const PackUniformHash &
 bool Renderer::uploadUBOsForCommand(QRhiCommandBuffer *cb, const RenderView *rv,
                                     const RenderCommand &command)
 {
-    Q_UNUSED(cb)
+    Q_UNUSED(cb);
     RHIGraphicsPipeline *pipeline = command.pipeline;
     if (!pipeline)
         return true;
diff --git a/src/plugins/renderers/rhi/renderer/renderview.cpp b/src/plugins/renderers/rhi/renderer/renderview.cpp
index ed6ffa4fa..4602d3fe2 100644
--- a/src/plugins/renderers/rhi/renderer/renderview.cpp
+++ b/src/plugins/renderers/rhi/renderer/renderview.cpp
@@ -261,9 +261,9 @@ struct SubRangeSorter
 {
     static void sortSubRange(EntityRenderCommandDataView *view, size_t begin, const size_t end)
     {
-        Q_UNUSED(view)
-        Q_UNUSED(begin)
-        Q_UNUSED(end)
+        Q_UNUSED(view);
+        Q_UNUSED(begin);
+        Q_UNUSED(end);
         Q_UNREACHABLE();
     }
 };
@@ -966,7 +966,7 @@ void RenderView::setUniformBlockValue(ShaderParameterPack &uniformPack, const RH
                                       const ShaderUniformBlock &block,
                                       const UniformValue &value) const
 {
-    Q_UNUSED(shader)
+    Q_UNUSED(shader);
 
     if (value.valueType() == UniformValue::NodeId) {
 
@@ -988,7 +988,7 @@ void RenderView::setShaderStorageValue(ShaderParameterPack &uniformPack, const R
                                        const ShaderStorageBlock &block,
                                        const UniformValue &value) const
 {
-    Q_UNUSED(shader)
+    Q_UNUSED(shader);
     if (value.valueType() == UniformValue::NodeId) {
         Buffer *buffer = nullptr;
         if ((buffer = m_manager->bufferManager()->lookupResource(
@@ -1070,7 +1070,7 @@ void RenderView::setShaderAndUniforms(RenderCommand *command, ParameterInfoList
                                       const QVector<LightSource> &activeLightSources,
                                       EnvironmentLight *environmentLight) const
 {
-    Q_UNUSED(entity)
+    Q_UNUSED(entity);
 
     // The VAO Handle is set directly in the renderer thread so as to avoid having to use a mutex
     // here Set shader, technique, and effect by basically doing :
diff --git a/src/plugins/renderers/rhi/textures/texture.cpp b/src/plugins/renderers/rhi/textures/texture.cpp
index cef0cc2fc..e70991a9a 100644
--- a/src/plugins/renderers/rhi/textures/texture.cpp
+++ b/src/plugins/renderers/rhi/textures/texture.cpp
@@ -257,8 +257,8 @@ QRhiTextureUploadEntry createUploadEntry(int mipLevel, int layer, int xOffset, i
                                          int zOffset, const QByteArray &bytes,
                                          const QTextureImageDataPtr &data) noexcept
 {
-    Q_UNUSED(zOffset)
-    Q_UNUSED(data)
+    Q_UNUSED(zOffset);
+    Q_UNUSED(data);
     QRhiTextureSubresourceUploadDescription description;
     description.setData(bytes);
     description.setSourceTopLeft(QPoint(xOffset, yOffset));
diff --git a/src/plugins/renderplugins/scene2d/main.cpp b/src/plugins/renderplugins/scene2d/main.cpp
index a3392e55c..31a4daaf9 100644
--- a/src/plugins/renderplugins/scene2d/main.cpp
+++ b/src/plugins/renderplugins/scene2d/main.cpp
@@ -52,8 +52,8 @@ class Scene2DPlugin : public Qt3DRender::Render::QRenderPluginFactoryIf
     Qt3DRender::Render::QRenderPlugin *create(const QString &key,
                                               const QStringList &paramList) override
     {
-        Q_UNUSED(key)
-        Q_UNUSED(paramList)
+        Q_UNUSED(key);
+        Q_UNUSED(paramList);
         return new Qt3DRender::Render::Scene2DPlugin();
     }
 };
diff --git a/src/plugins/sceneparsers/assimp/main.cpp b/src/plugins/sceneparsers/assimp/main.cpp
index 445a44d16..2727bb6fe 100644
--- a/src/plugins/sceneparsers/assimp/main.cpp
+++ b/src/plugins/sceneparsers/assimp/main.cpp
@@ -50,8 +50,8 @@ class AssimpSceneImportPlugin : public Qt3DRender::QSceneImportPlugin
 
     Qt3DRender::QSceneImporter *create(const QString &key, const QStringList &paramList) override
     {
-        Q_UNUSED(key)
-        Q_UNUSED(paramList)
+        Q_UNUSED(key);
+        Q_UNUSED(paramList);
         return new Qt3DRender::AssimpImporter();
     }
 };
diff --git a/src/plugins/sceneparsers/gltf/gltfimporter.cpp b/src/plugins/sceneparsers/gltf/gltfimporter.cpp
index 856ac70e6..a43c9abd0 100644
--- a/src/plugins/sceneparsers/gltf/gltfimporter.cpp
+++ b/src/plugins/sceneparsers/gltf/gltfimporter.cpp
@@ -735,7 +735,7 @@ GLTFImporter::AccessorData::AccessorData(const QJsonObject &json, int major, int
       offset(0),
       stride(0)
 {
-    Q_UNUSED(minor)
+    Q_UNUSED(minor);
 
     if (major > 1) {
         bufferViewName = QString::number(json.value(KEY_BUFFER_VIEW).toInt());
diff --git a/src/plugins/sceneparsers/gltf/main.cpp b/src/plugins/sceneparsers/gltf/main.cpp
index d113b2efb..6c612b24d 100644
--- a/src/plugins/sceneparsers/gltf/main.cpp
+++ b/src/plugins/sceneparsers/gltf/main.cpp
@@ -51,8 +51,8 @@ class GLTFSceneImportPlugin : public Qt3DRender::QSceneImportPlugin
 
     Qt3DRender::QSceneImporter *create(const QString &key, const QStringList &paramList) override
     {
-        Q_UNUSED(key)
-        Q_UNUSED(paramList)
+        Q_UNUSED(key);
+        Q_UNUSED(paramList);
         return new Qt3DRender::GLTFImporter();
     }
 };
diff --git a/src/plugins/sceneparsers/gltfexport/main.cpp b/src/plugins/sceneparsers/gltfexport/main.cpp
index 7a74d4d01..16cd533b8 100644
--- a/src/plugins/sceneparsers/gltfexport/main.cpp
+++ b/src/plugins/sceneparsers/gltfexport/main.cpp
@@ -50,8 +50,8 @@ class GLTFSceneExportPlugin : public Qt3DRender::QSceneExportPlugin
 
     Qt3DRender::QSceneExporter *create(const QString &key, const QStringList &paramList) override
     {
-        Q_UNUSED(key)
-        Q_UNUSED(paramList)
+        Q_UNUSED(key);
+        Q_UNUSED(paramList);
         return new Qt3DRender::GLTFExporter();
     }
 };
diff --git a/src/quick3d/quick3d/qt3dquick_global.cpp b/src/quick3d/quick3d/qt3dquick_global.cpp
index ad8cd52ea..a5aa9e217 100644
--- a/src/quick3d/quick3d/qt3dquick_global.cpp
+++ b/src/quick3d/quick3d/qt3dquick_global.cpp
@@ -153,7 +153,7 @@ class Quick3DValueTypeProvider : 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
diff --git a/src/render/backend/rendersettings.cpp b/src/render/backend/rendersettings.cpp
index c1948d4b1..3d4569940 100644
--- a/src/render/backend/rendersettings.cpp
+++ b/src/render/backend/rendersettings.cpp
@@ -124,13 +124,13 @@ Qt3DCore::QBackendNode *RenderSettingsFunctor::create(Qt3DCore::QNodeId) const
 
 Qt3DCore::QBackendNode *RenderSettingsFunctor::get(Qt3DCore::QNodeId id) const
 {
-    Q_UNUSED(id)
+    Q_UNUSED(id);
     return m_renderer->settings();
 }
 
 void RenderSettingsFunctor::destroy(Qt3DCore::QNodeId id) const
 {
-    Q_UNUSED(id)
+    Q_UNUSED(id);
     // Deletes the old settings object
     auto settings = m_renderer->settings();
     if (settings && settings->peerId() == id) {
diff --git a/src/render/frontend/qrenderpluginfactoryif.cpp b/src/render/frontend/qrenderpluginfactoryif.cpp
index af567084c..339622f65 100644
--- a/src/render/frontend/qrenderpluginfactoryif.cpp
+++ b/src/render/frontend/qrenderpluginfactoryif.cpp
@@ -54,8 +54,8 @@ QRenderPluginFactoryIf::~QRenderPluginFactoryIf()
 
 QRenderPlugin *QRenderPluginFactoryIf::create(const QString &key, const QStringList &paramList)
 {
-    Q_UNUSED(key)
-    Q_UNUSED(paramList)
+    Q_UNUSED(key);
+    Q_UNUSED(paramList);
     return nullptr;
 }
 
diff --git a/src/render/io/qsceneexportplugin.cpp b/src/render/io/qsceneexportplugin.cpp
index b7dea8f63..9ba2a6298 100644
--- a/src/render/io/qsceneexportplugin.cpp
+++ b/src/render/io/qsceneexportplugin.cpp
@@ -55,8 +55,8 @@ QSceneExportPlugin::~QSceneExportPlugin()
 
 QSceneExporter *QSceneExportPlugin::create(const QString &key, const QStringList &paramList)
 {
-    Q_UNUSED(key)
-    Q_UNUSED(paramList)
+    Q_UNUSED(key);
+    Q_UNUSED(paramList);
     return nullptr;
 }
 
diff --git a/src/render/io/qsceneimportplugin.cpp b/src/render/io/qsceneimportplugin.cpp
index 97e7f3d35..8cafdd25a 100644
--- a/src/render/io/qsceneimportplugin.cpp
+++ b/src/render/io/qsceneimportplugin.cpp
@@ -55,8 +55,8 @@ QSceneImportPlugin::~QSceneImportPlugin()
 
 QSceneImporter *QSceneImportPlugin::create(const QString &key, const QStringList &paramList)
 {
-    Q_UNUSED(key)
-    Q_UNUSED(paramList)
+    Q_UNUSED(key);
+    Q_UNUSED(paramList);
     return nullptr;
 }
 
diff --git a/src/render/jobs/calcboundingvolumejob.cpp b/src/render/jobs/calcboundingvolumejob.cpp
index cb064588e..c26bb67da 100644
--- a/src/render/jobs/calcboundingvolumejob.cpp
+++ b/src/render/jobs/calcboundingvolumejob.cpp
@@ -470,7 +470,7 @@ void CalculateBoundingVolumeJob::run()
 
 void CalculateBoundingVolumeJob::postFrame(QAspectEngine *aspectEngine)
 {
-    Q_UNUSED(aspectEngine)
+    Q_UNUSED(aspectEngine);
     for (Geometry *backend : qAsConst(m_updatedGeometries)) {
         Qt3DCore::QGeometry *node = qobject_cast<Qt3DCore::QGeometry *>(m_frontEndNodeManager->lookupNode(backend->peerId()));
         if (!node)
diff --git a/src/render/jobs/computefilteredboundingvolumejob.cpp b/src/render/jobs/computefilteredboundingvolumejob.cpp
index 6cc9a5d3c..a0681bad7 100644
--- a/src/render/jobs/computefilteredboundingvolumejob.cpp
+++ b/src/render/jobs/computefilteredboundingvolumejob.cpp
@@ -143,8 +143,8 @@ void ComputeFilteredBoundingVolumeJob::run()
 
 void ComputeFilteredBoundingVolumeJob::finished(Qt3DCore::QAspectManager *aspectManager, const Qt3DRender::Render::Sphere &sphere)
 {
-    Q_UNUSED(aspectManager)
-    Q_UNUSED(sphere)
+    Q_UNUSED(aspectManager);
+    Q_UNUSED(sphere);
 }
 
 void ComputeFilteredBoundingVolumeJobPrivate::postFrame(Qt3DCore::QAspectManager *aspectManager)
diff --git a/src/render/picking/pickeventfilter.cpp b/src/render/picking/pickeventfilter.cpp
index e4f31a9b2..adc584948 100644
--- a/src/render/picking/pickeventfilter.cpp
+++ b/src/render/picking/pickeventfilter.cpp
@@ -81,7 +81,7 @@ QList<QKeyEvent> PickEventFilter::pendingKeyEvents()
 */
 bool PickEventFilter::eventFilter(QObject *obj, QEvent *e)
 {
-    Q_UNUSED(obj)
+    Q_UNUSED(obj);
     switch (e->type()) {
     case QEvent::MouseButtonPress:
     case QEvent::MouseButtonRelease:
diff --git a/src/render/qrendererplugin.cpp b/src/render/qrendererplugin.cpp
index a9ce2c744..edd4b1bf0 100644
--- a/src/render/qrendererplugin.cpp
+++ b/src/render/qrendererplugin.cpp
@@ -56,7 +56,7 @@ QRendererPlugin::~QRendererPlugin()
 
 AbstractRenderer *QRendererPlugin::create(const QString &key)
 {
-    Q_UNUSED(key)
+    Q_UNUSED(key);
     return nullptr;
 }
 
diff --git a/src/render/texture/qpaintedtextureimage.cpp b/src/render/texture/qpaintedtextureimage.cpp
index 6e220f340..80bdc184f 100644
--- a/src/render/texture/qpaintedtextureimage.cpp
+++ b/src/render/texture/qpaintedtextureimage.cpp
@@ -205,7 +205,7 @@ void QPaintedTextureImage::setSize(QSize size)
 */
 void QPaintedTextureImage::update(const QRect &rect)
 {
-    Q_UNUSED(rect)
+    Q_UNUSED(rect);
     Q_D(QPaintedTextureImage);
 
     d->repaint();
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);