summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/utils
diff options
context:
space:
mode:
authorLars Schmertmann <Lars.Schmertmann@governikus.de>2020-06-26 14:42:52 +0200
committerLars Schmertmann <Lars.Schmertmann@governikus.de>2020-06-26 15:21:41 +0200
commit09e937788d0bb32a133fbf668b834fa13e7669c3 (patch)
tree0db182fd01569511994ea9ff570abc8dc40be9d7 /src/datavisualization/utils
parent3c7d4de151d0d87b687644381c5d8aaef06f21b2 (diff)
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>
Diffstat (limited to 'src/datavisualization/utils')
-rw-r--r--src/datavisualization/utils/shaderhelper.cpp6
-rw-r--r--src/datavisualization/utils/texturehelper.cpp10
2 files changed, 8 insertions, 8 deletions
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