aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph
diff options
context:
space:
mode:
authorLars Schmertmann <Lars.Schmertmann@governikus.de>2020-06-26 14:43:02 +0200
committerLars Schmertmann <Lars.Schmertmann@governikus.de>2020-06-26 19:18:03 +0200
commite79281533d61dda90d1c5995345a66e6089c7501 (patch)
tree5033642cb0ae1d76aa0fc0525e153c04eefc921d /src/quick/scenegraph
parent6d8aca544ccb1e2624a679e2d65622461f643291 (diff)
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>
Diffstat (limited to 'src/quick/scenegraph')
-rw-r--r--src/quick/scenegraph/adaptations/software/qsgsoftwareinternalrectanglenode_p.h2
-rw-r--r--src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp2
-rw-r--r--src/quick/scenegraph/coreapi/qsgnodeupdater.cpp4
-rw-r--r--src/quick/scenegraph/coreapi/qsgtexture.cpp2
-rw-r--r--src/quick/scenegraph/qsgadaptationlayer_p.h4
-rw-r--r--src/quick/scenegraph/qsgrenderloop.cpp2
6 files changed, 8 insertions, 8 deletions
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;