From 09e937788d0bb32a133fbf668b834fa13e7669c3 Mon Sep 17 00:00:00 2001 From: Lars Schmertmann Date: Fri, 26 Jun 2020 14:42:52 +0200 Subject: 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 Reviewed-by: Jarek Kobus --- src/datavisualization/utils/shaderhelper.cpp | 6 +++--- src/datavisualization/utils/texturehelper.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/datavisualization/utils') 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 *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 -- cgit v1.2.3