Add ; to Q_UNUSED

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

Task-number: QTBUG-82978
Change-Id: I66f620431011d02cb1542e8ad613dadd28fdd843
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

15 files changed, 91 insertions, 91 deletions

diff --git a/src/datavisualization/axis/qabstract3daxis.cpp b/src/datavisualization/axis/qabstract3daxis.cpp
index 72754ac8..56b87c98 100644
--- a/src/datavisualization/axis/qabstract3daxis.cpp
+++ b/src/datavisualization/axis/qabstract3daxis.cpp
@@ -228,7 +228,7 @@ QString QAbstract3DAxis::title() const
  */
 void QAbstract3DAxis::setLabels(const QStringList &labels)
 {
-    Q_UNUSED(labels)
+    Q_UNUSED(labels);
 }
 
 QStringList QAbstract3DAxis::labels() const
diff --git a/src/datavisualization/data/abstractitemmodelhandler.cpp b/src/datavisualization/data/abstractitemmodelhandler.cpp
index 332d6861..703a337f 100644
--- a/src/datavisualization/data/abstractitemmodelhandler.cpp
+++ b/src/datavisualization/data/abstractitemmodelhandler.cpp
@@ -88,9 +88,9 @@ QAbstractItemModel *AbstractItemModelHandler::itemModel() const
 void AbstractItemModelHandler::handleColumnsInserted(const QModelIndex &parent,
                                                      int start, int end)
 {
-    Q_UNUSED(parent)
-    Q_UNUSED(start)
-    Q_UNUSED(end)
+    Q_UNUSED(parent);
+    Q_UNUSED(start);
+    Q_UNUSED(end);
 
     // Manipulating columns changes all rows in proxies that map rows/columns directly,
     // and its effects are not clearly defined in others -> always do full reset.
@@ -106,11 +106,11 @@ void AbstractItemModelHandler::handleColumnsMoved(const QModelIndex &sourceParen
                                                   const QModelIndex &destinationParent,
                                                   int destinationColumn)
 {
-    Q_UNUSED(sourceParent)
-    Q_UNUSED(sourceStart)
-    Q_UNUSED(sourceEnd)
-    Q_UNUSED(destinationParent)
-    Q_UNUSED(destinationColumn)
+    Q_UNUSED(sourceParent);
+    Q_UNUSED(sourceStart);
+    Q_UNUSED(sourceEnd);
+    Q_UNUSED(destinationParent);
+    Q_UNUSED(destinationColumn);
 
     // Manipulating columns changes all rows in proxies that map rows/columns directly,
     // and its effects are not clearly defined in others -> always do full reset.
@@ -123,9 +123,9 @@ void AbstractItemModelHandler::handleColumnsMoved(const QModelIndex &sourceParen
 void AbstractItemModelHandler::handleColumnsRemoved(const QModelIndex &parent,
                                                     int start, int end)
 {
-    Q_UNUSED(parent)
-    Q_UNUSED(start)
-    Q_UNUSED(end)
+    Q_UNUSED(parent);
+    Q_UNUSED(start);
+    Q_UNUSED(end);
 
     // Manipulating columns changes all rows in proxies that map rows/columns directly,
     // and its effects are not clearly defined in others -> always do full reset.
@@ -139,9 +139,9 @@ void AbstractItemModelHandler::handleDataChanged(const QModelIndex &topLeft,
                                                  const QModelIndex &bottomRight,
                                                  const QList<int> &roles)
 {
-    Q_UNUSED(topLeft)
-    Q_UNUSED(bottomRight)
-    Q_UNUSED(roles)
+    Q_UNUSED(topLeft);
+    Q_UNUSED(bottomRight);
+    Q_UNUSED(roles);
 
     // Default handling for dataChanged is to do full reset, as it cannot be optimized
     // in a general case, where we do not know which row/column/index the item model item
@@ -155,8 +155,8 @@ void AbstractItemModelHandler::handleDataChanged(const QModelIndex &topLeft,
 void AbstractItemModelHandler::handleLayoutChanged(const QList<QPersistentModelIndex> &parents,
                                                    QAbstractItemModel::LayoutChangeHint hint)
 {
-    Q_UNUSED(parents)
-    Q_UNUSED(hint)
+    Q_UNUSED(parents);
+    Q_UNUSED(hint);
 
     // Resolve entire model if layout changes
     if (!m_resolveTimer.isActive()) {
@@ -176,9 +176,9 @@ void AbstractItemModelHandler::handleModelReset()
 
 void AbstractItemModelHandler::handleRowsInserted(const QModelIndex &parent, int start, int end)
 {
-    Q_UNUSED(parent)
-    Q_UNUSED(start)
-    Q_UNUSED(end)
+    Q_UNUSED(parent);
+    Q_UNUSED(start);
+    Q_UNUSED(end);
 
     // Default handling for rowsInserted is to do full reset, as it cannot be optimized
     // in a general case, where we do not know which row/column/index the item model item
@@ -195,11 +195,11 @@ void AbstractItemModelHandler::handleRowsMoved(const QModelIndex &sourceParent,
                                                const QModelIndex &destinationParent,
                                                int destinationRow)
 {
-    Q_UNUSED(sourceParent)
-    Q_UNUSED(sourceStart)
-    Q_UNUSED(sourceEnd)
-    Q_UNUSED(destinationParent)
-    Q_UNUSED(destinationRow)
+    Q_UNUSED(sourceParent);
+    Q_UNUSED(sourceStart);
+    Q_UNUSED(sourceEnd);
+    Q_UNUSED(destinationParent);
+    Q_UNUSED(destinationRow);
 
     // Default handling for rowsMoved is to do full reset, as it cannot be optimized
     // in a general case, where we do not know which row/column/index the item model item
@@ -212,9 +212,9 @@ void AbstractItemModelHandler::handleRowsMoved(const QModelIndex &sourceParent,
 
 void AbstractItemModelHandler::handleRowsRemoved(const QModelIndex &parent, int start, int end)
 {
-    Q_UNUSED(parent)
-    Q_UNUSED(start)
-    Q_UNUSED(end)
+    Q_UNUSED(parent);
+    Q_UNUSED(start);
+    Q_UNUSED(end);
 
     // Default handling for rowsRemoved is to do full reset, as it cannot be optimized
     // in a general case, where we do not know which row/column/index the item model item
diff --git a/src/datavisualization/data/scatteritemmodelhandler.cpp b/src/datavisualization/data/scatteritemmodelhandler.cpp
index 59fba44d..67b9bb3a 100644
--- a/src/datavisualization/data/scatteritemmodelhandler.cpp
+++ b/src/datavisualization/data/scatteritemmodelhandler.cpp
@@ -97,7 +97,7 @@ void ScatterItemModelHandler::handleRowsInserted(const QModelIndex &parent, int
 
 void ScatterItemModelHandler::handleRowsRemoved(const QModelIndex &parent, int start, int end)
 {
-    Q_UNUSED(parent)
+    Q_UNUSED(parent);
 
     // Do nothing if full reset already pending
     if (!m_fullReset) {
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index 0fe0aa6d..40cbe88d 100644
--- a/src/datavisualization/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -690,7 +690,7 @@ void Abstract3DController::handleThemeMultiHighlightGradientChanged(const QLinea
 
 void Abstract3DController::handleThemeTypeChanged(Q3DTheme::Theme theme)
 {
-    Q_UNUSED(theme)
+    Q_UNUSED(theme);
 
     // Changing theme type is logically equivalent of changing the entire theme
     // object, so reset all attached series to the new theme.
@@ -1070,7 +1070,7 @@ void Abstract3DController::updateCustomItem()
 
 void Abstract3DController::handleAxisTitleChanged(const QString &title)
 {
-    Q_UNUSED(title)
+    Q_UNUSED(title);
     handleAxisTitleChangedBySender(sender());
 }
 
@@ -1111,8 +1111,8 @@ void Abstract3DController::handleAxisLabelsChangedBySender(QObject *sender)
 
 void Abstract3DController::handleAxisRangeChanged(float min, float max)
 {
-    Q_UNUSED(min)
-    Q_UNUSED(max)
+    Q_UNUSED(min);
+    Q_UNUSED(max);
     handleAxisRangeChangedBySender(sender());
 }
 
@@ -1135,7 +1135,7 @@ void Abstract3DController::handleAxisRangeChangedBySender(QObject *sender)
 
 void Abstract3DController::handleAxisSegmentCountChanged(int count)
 {
-    Q_UNUSED(count)
+    Q_UNUSED(count);
     handleAxisSegmentCountChangedBySender(sender());
 }
 
@@ -1154,7 +1154,7 @@ void Abstract3DController::handleAxisSegmentCountChangedBySender(QObject *sender
 
 void Abstract3DController::handleAxisSubSegmentCountChanged(int count)
 {
-    Q_UNUSED(count)
+    Q_UNUSED(count);
     handleAxisSubSegmentCountChangedBySender(sender());
 }
 
@@ -1183,13 +1183,13 @@ void Abstract3DController::handleAxisAutoAdjustRangeChanged(bool autoAdjust)
 
 void Abstract3DController::handleAxisLabelFormatChanged(const QString &format)
 {
-    Q_UNUSED(format)
+    Q_UNUSED(format);
     handleAxisLabelFormatChangedBySender(sender());
 }
 
 void Abstract3DController::handleAxisReversedChanged(bool enable)
 {
-    Q_UNUSED(enable)
+    Q_UNUSED(enable);
     handleAxisReversedChangedBySender(sender());
 }
 
@@ -1200,19 +1200,19 @@ void Abstract3DController::handleAxisFormatterDirty()
 
 void Abstract3DController::handleAxisLabelAutoRotationChanged(float angle)
 {
-    Q_UNUSED(angle)
+    Q_UNUSED(angle);
     handleAxisLabelAutoRotationChangedBySender(sender());
 }
 
 void Abstract3DController::handleAxisTitleVisibilityChanged(bool visible)
 {
-    Q_UNUSED(visible)
+    Q_UNUSED(visible);
     handleAxisTitleVisibilityChangedBySender(sender());
 }
 
 void Abstract3DController::handleAxisTitleFixedChanged(bool fixed)
 {
-    Q_UNUSED(fixed)
+    Q_UNUSED(fixed);
     handleAxisTitleFixedChangedBySender(sender());
 }
 
@@ -1229,13 +1229,13 @@ void Abstract3DController::handleInputViewChanged(QAbstract3DInputHandler::Input
 
 void Abstract3DController::handleInputPositionChanged(const QPoint &position)
 {
-    Q_UNUSED(position)
+    Q_UNUSED(position);
     emitNeedRender();
 }
 
 void Abstract3DController::handleSeriesVisibilityChanged(bool visible)
 {
-    Q_UNUSED(visible)
+    Q_UNUSED(visible);
 
     handleSeriesVisibilityChangedBySender(sender());
 }
@@ -1467,7 +1467,7 @@ void Abstract3DController::setAxisHelper(QAbstract3DAxis::AxisOrientation orient
 QAbstract3DAxis *Abstract3DController::createDefaultAxis(
         QAbstract3DAxis::AxisOrientation orientation)
 {
-    Q_UNUSED(orientation)
+    Q_UNUSED(orientation);
 
     // The default default axis is a value axis. If the graph type has a different default axis
     // for some orientation, this function needs to be overridden.
diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index a52d6981..ef77dc92 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -274,8 +274,8 @@ void Abstract3DRenderer::initGradientShaders(const QString &vertexShader,
                                              const QString &fragmentShader)
 {
     // Do nothing by default
-    Q_UNUSED(vertexShader)
-    Q_UNUSED(fragmentShader)
+    Q_UNUSED(vertexShader);
+    Q_UNUSED(fragmentShader);
 }
 
 void Abstract3DRenderer::initStaticSelectedItemShaders(const QString &vertexShader,
@@ -284,10 +284,10 @@ void Abstract3DRenderer::initStaticSelectedItemShaders(const QString &vertexShad
                                                        const QString &gradientFragmentShader)
 {
     // Do nothing by default
-    Q_UNUSED(vertexShader)
-    Q_UNUSED(fragmentShader)
-    Q_UNUSED(gradientVertexShader)
-    Q_UNUSED(gradientFragmentShader)
+    Q_UNUSED(vertexShader);
+    Q_UNUSED(fragmentShader);
+    Q_UNUSED(gradientVertexShader);
+    Q_UNUSED(gradientFragmentShader);
 }
 
 void Abstract3DRenderer::initCustomItemShaders(const QString &vertexShader,
@@ -697,8 +697,8 @@ void Abstract3DRenderer::modifiedSeriesList(const QList<QAbstract3DSeries *> &se
 void Abstract3DRenderer::fixMeshFileName(QString &fileName, QAbstract3DSeries::Mesh mesh)
 {
     // Default implementation does nothing.
-    Q_UNUSED(fileName)
-    Q_UNUSED(mesh)
+    Q_UNUSED(fileName);
+    Q_UNUSED(mesh);
 }
 
 void Abstract3DRenderer::updateSeries(const QList<QAbstract3DSeries *> &seriesList)
diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp
index 6b304026..a6bfd080 100644
--- a/src/datavisualization/engine/bars3dcontroller.cpp
+++ b/src/datavisualization/engine/bars3dcontroller.cpp
@@ -167,8 +167,8 @@ void Bars3DController::handleArrayReset()
 
 void Bars3DController::handleRowsAdded(int startIndex, int count)
 {
-    Q_UNUSED(startIndex)
-    Q_UNUSED(count)
+    Q_UNUSED(startIndex);
+    Q_UNUSED(count);
     QBar3DSeries *series = static_cast<QBarDataProxy *>(sender())->series();
     if (series->isVisible()) {
         adjustAxisRanges();
@@ -217,8 +217,8 @@ void Bars3DController::handleRowsChanged(int startIndex, int count)
 
 void Bars3DController::handleRowsRemoved(int startIndex, int count)
 {
-    Q_UNUSED(startIndex)
-    Q_UNUSED(count)
+    Q_UNUSED(startIndex);
+    Q_UNUSED(count);
 
     QBar3DSeries *series = static_cast<QBarDataProxy *>(sender())->series();
     if (series == m_selectedBarSeries) {
@@ -246,8 +246,8 @@ void Bars3DController::handleRowsRemoved(int startIndex, int count)
 
 void Bars3DController::handleRowsInserted(int startIndex, int count)
 {
-    Q_UNUSED(startIndex)
-    Q_UNUSED(count)
+    Q_UNUSED(startIndex);
+    Q_UNUSED(count);
     QBar3DSeries *series = static_cast<QBarDataProxy *>(sender())->series();
     if (series == m_selectedBarSeries) {
         // If rows inserted to selected series before the selection, adjust the selection
@@ -325,8 +325,8 @@ void Bars3DController::handleDataColumnLabelsChanged()
 void Bars3DController::handleAxisAutoAdjustRangeChangedInOrientation(
         QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust)
 {
-    Q_UNUSED(orientation)
-    Q_UNUSED(autoAdjust)
+    Q_UNUSED(orientation);
+    Q_UNUSED(autoAdjust);
     adjustAxisRanges();
 }
 
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp
index cf2eda4e..bfc0f5c8 100644
--- a/src/datavisualization/engine/bars3drenderer.cpp
+++ b/src/datavisualization/engine/bars3drenderer.cpp
@@ -2856,7 +2856,7 @@ QVector3D Bars3DRenderer::convertPositionToTranslation(const QVector3D &position
 
 void Bars3DRenderer::updateAspectRatio(float ratio)
 {
-    Q_UNUSED(ratio)
+    Q_UNUSED(ratio);
 }
 
 void Bars3DRenderer::updateFloorLevel(float level)
diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp
index 2e0805e0..3b873ba4 100644
--- a/src/datavisualization/engine/drawer.cpp
+++ b/src/datavisualization/engine/drawer.cpp
@@ -106,7 +106,7 @@ void Drawer::drawObject(ShaderHelper *shader, AbstractObjectHelper *object, GLui
                         GLuint depthTextureId, GLuint textureId3D)
 {
 #if defined(QT_OPENGL_ES_2)
-    Q_UNUSED(textureId3D)
+    Q_UNUSED(textureId3D);
 #endif
     if (textureId) {
         // Activate texture
diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp
index 6fc29b20..365617e0 100644
--- a/src/datavisualization/engine/scatter3dcontroller.cpp
+++ b/src/datavisualization/engine/scatter3dcontroller.cpp
@@ -154,8 +154,8 @@ void Scatter3DController::handleArrayReset()
 
 void Scatter3DController::handleItemsAdded(int startIndex, int count)
 {
-    Q_UNUSED(startIndex)
-    Q_UNUSED(count)
+    Q_UNUSED(startIndex);
+    Q_UNUSED(count);
     QScatter3DSeries *series = static_cast<QScatterDataProxy *>(sender())->series();
     if (series->isVisible()) {
         adjustAxisRanges();
@@ -201,8 +201,8 @@ void Scatter3DController::handleItemsChanged(int startIndex, int count)
 
 void Scatter3DController::handleItemsRemoved(int startIndex, int count)
 {
-    Q_UNUSED(startIndex)
-    Q_UNUSED(count)
+    Q_UNUSED(startIndex);
+    Q_UNUSED(count);
     QScatter3DSeries *series = static_cast<QScatterDataProxy *>(sender())->series();
     if (series == m_selectedItemSeries) {
         // If items removed from selected series before the selection, adjust the selection
@@ -234,8 +234,8 @@ void Scatter3DController::handleItemsRemoved(int startIndex, int count)
 
 void Scatter3DController::handleItemsInserted(int startIndex, int count)
 {
-    Q_UNUSED(startIndex)
-    Q_UNUSED(count)
+    Q_UNUSED(startIndex);
+    Q_UNUSED(count);
     QScatter3DSeries *series = static_cast<QScatterDataProxy *>(sender())->series();
     if (series == m_selectedItemSeries) {
         // If items inserted to selected series before the selection, adjust the selection
@@ -278,8 +278,8 @@ void Scatter3DController::startRecordingRemovesAndInserts()
 void Scatter3DController::handleAxisAutoAdjustRangeChangedInOrientation(
         QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust)
 {
-    Q_UNUSED(orientation)
-    Q_UNUSED(autoAdjust)
+    Q_UNUSED(orientation);
+    Q_UNUSED(autoAdjust);
     adjustAxisRanges();
 }
 
diff --git a/src/datavisualization/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp
index d646429a..be4a52a9 100644
--- a/src/datavisualization/engine/selectionpointer.cpp
+++ b/src/datavisualization/engine/selectionpointer.cpp
@@ -80,7 +80,7 @@ void SelectionPointer::updateScene(Q3DScene *scene)
 
 void SelectionPointer::renderSelectionPointer(GLuint defaultFboHandle, bool useOrtho)
 {
-    Q_UNUSED(defaultFboHandle)
+    Q_UNUSED(defaultFboHandle);
 
     glViewport(m_mainViewPort.x(), m_mainViewPort.y(),
                m_mainViewPort.width(), m_mainViewPort.height());
@@ -151,7 +151,7 @@ void SelectionPointer::renderSelectionPointer(GLuint defaultFboHandle, bool useO
 
 void SelectionPointer::renderSelectionLabel(GLuint defaultFboHandle, bool useOrtho)
 {
-    Q_UNUSED(defaultFboHandle)
+    Q_UNUSED(defaultFboHandle);
 
     glViewport(m_mainViewPort.x(), m_mainViewPort.y(),
                m_mainViewPort.width(), m_mainViewPort.height());
diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp
index 1a140a5c..ba845ac1 100644
--- a/src/datavisualization/engine/surface3dcontroller.cpp
+++ b/src/datavisualization/engine/surface3dcontroller.cpp
@@ -112,8 +112,8 @@ void Surface3DController::synchDataToRenderer()
 void Surface3DController::handleAxisAutoAdjustRangeChangedInOrientation(
         QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust)
 {
-    Q_UNUSED(orientation)
-    Q_UNUSED(autoAdjust)
+    Q_UNUSED(orientation);
+    Q_UNUSED(autoAdjust);
 
     adjustAxisRanges();
 }
@@ -416,8 +416,8 @@ void Surface3DController::handleItemChanged(int rowIndex, int columnIndex)
 
 void Surface3DController::handleRowsAdded(int startIndex, int count)
 {
-    Q_UNUSED(startIndex)
-    Q_UNUSED(count)
+    Q_UNUSED(startIndex);
+    Q_UNUSED(count);
     QSurface3DSeries *series = static_cast<QSurfaceDataProxy *>(sender())->series();
     if (series->isVisible()) {
         adjustAxisRanges();
@@ -430,8 +430,8 @@ void Surface3DController::handleRowsAdded(int startIndex, int count)
 
 void Surface3DController::handleRowsInserted(int startIndex, int count)
 {
-    Q_UNUSED(startIndex)
-    Q_UNUSED(count)
+    Q_UNUSED(startIndex);
+    Q_UNUSED(count);
     QSurface3DSeries *series = static_cast<QSurfaceDataProxy *>(sender())->series();
     if (series == m_selectedSeries) {
         // If rows inserted to selected series before the selection, adjust the selection
@@ -454,8 +454,8 @@ void Surface3DController::handleRowsInserted(int startIndex, int count)
 
 void Surface3DController::handleRowsRemoved(int startIndex, int count)
 {
-    Q_UNUSED(startIndex)
-    Q_UNUSED(count)
+    Q_UNUSED(startIndex);
+    Q_UNUSED(count);
     QSurface3DSeries *series = static_cast<QSurfaceDataProxy *>(sender())->series();
     if (series == m_selectedSeries) {
         // If rows removed from selected series before the selection, adjust the selection
diff --git a/src/datavisualization/utils/shaderhelper.cpp b/src/datavisualization/utils/shaderhelper.cpp
index 92f46a2b..ba029be2 100644
--- a/src/datavisualization/utils/shaderhelper.cpp
+++ b/src/datavisualization/utils/shaderhelper.cpp
@@ -35,9 +35,9 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 void discardDebugMsgs(QtMsgType type, const QMessageLogContext &context, const QString &msg)
 {
-    Q_UNUSED(type)
-    Q_UNUSED(context)
-    Q_UNUSED(msg)
+    Q_UNUSED(type);
+    Q_UNUSED(context);
+    Q_UNUSED(msg);
     // Used to discard warnings generated during shader test compilation
 }
 
diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp
index b1371610..0e66459c 100644
--- a/src/datavisualization/utils/texturehelper.cpp
+++ b/src/datavisualization/utils/texturehelper.cpp
@@ -116,8 +116,8 @@ GLuint TextureHelper::create3DTexture(const QList<uchar> *data, int width, int h
 
     GLuint textureId = 0;
 #if defined(QT_OPENGL_ES_2)
-    Q_UNUSED(dataFormat)
-    Q_UNUSED(data)
+    Q_UNUSED(dataFormat);
+    Q_UNUSED(data);
 #else
     glEnable(GL_TEXTURE_3D);
 
@@ -291,8 +291,8 @@ GLuint TextureHelper::createDepthTexture(const QSize &size, GLuint textureSize)
 {
     GLuint depthtextureid = 0;
 #if defined(QT_OPENGL_ES_2)
-    Q_UNUSED(size)
-    Q_UNUSED(textureSize)
+    Q_UNUSED(size);
+    Q_UNUSED(textureSize);
 #else
     if (!Utils::isOpenGLES()) {
         // Create depth texture for the shadow mapping
@@ -317,7 +317,7 @@ GLuint TextureHelper::createDepthTextureFrameBuffer(const QSize &size, GLuint &f
 {
     GLuint depthtextureid = createDepthTexture(size, textureSize);
 #if defined(QT_OPENGL_ES_2)
-    Q_UNUSED(frameBuffer)
+    Q_UNUSED(frameBuffer);
 #else
     if (!Utils::isOpenGLES()) {
         // Create frame buffer
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp
index 4cec3bc8..5a1edbc7 100644
--- a/src/datavisualizationqml2/abstractdeclarative.cpp
+++ b/src/datavisualizationqml2/abstractdeclarative.cpp
@@ -399,7 +399,7 @@ void AbstractDeclarative::doneOpenGLContext(QQuickWindow *window)
 #ifdef USE_SHARED_CONTEXT
     m_qtContext->makeCurrent(window);
 #else
-    Q_UNUSED(window)
+    Q_UNUSED(window);
     m_stateStore->restoreGLState();
 #endif
 }
diff --git a/src/datavisualizationqml2/declarativetheme.cpp b/src/datavisualizationqml2/declarativetheme.cpp
index 1e44de0a..c3d283bf 100644
--- a/src/datavisualizationqml2/declarativetheme.cpp
+++ b/src/datavisualizationqml2/declarativetheme.cpp
@@ -55,14 +55,14 @@ QQmlListProperty<QObject> DeclarativeTheme3D::themeChildren()
 
 void DeclarativeTheme3D::appendThemeChildren(QQmlListProperty<QObject> *list, QObject *element)
 {
-    Q_UNUSED(list)
-    Q_UNUSED(element)
+    Q_UNUSED(list);
+    Q_UNUSED(element);
     // Nothing to do, themeChildren is there only to enable scoping gradient items in Theme3D item.
 }
 
 void DeclarativeTheme3D::handleTypeChange(Theme themeType)
 {
-    Q_UNUSED(themeType)
+    Q_UNUSED(themeType);
 
     // Theme changed, disconnect base color/gradient connections
     if (!m_colors.isEmpty()) {