summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Schmertmann <Lars.Schmertmann@governikus.de>2020-06-27 13:03:01 +0200
committerLars Schmertmann <Lars.Schmertmann@governikus.de>2020-06-30 10:44:12 +0200
commite0909423ce292d1aac7b263d3d3296efd8c3640c (patch)
tree1002205ac94bc78b791129b1af6a58e711080c9f
parent78af506ef90a8c458f6cc89acb2deef8a680ddca (diff)
downloadqtwayland-e0909423ce292d1aac7b263d3d3296efd8c3640c.tar.gz
Add ; to Q_UNUSED
This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: Ia626b9fbc2e4215cb9232ef9bcb71742d62dff4e Reviewed-by: Liang Qi <liang.qi@qt.io>
-rw-r--r--src/client/qwaylanddisplay.cpp2
-rw-r--r--src/client/qwaylandshellsurface.cpp4
-rw-r--r--src/client/qwaylandshellsurface_p.h2
-rw-r--r--src/compositor/compositor_api/qwaylandpointer.cpp2
-rw-r--r--src/compositor/extensions/qwaylandwlshellintegration.cpp4
-rw-r--r--tests/auto/client/shared_old/mockfullscreenshellv1.cpp6
-rw-r--r--tests/auto/client/tabletv2/tst_tabletv2.cpp2
7 files changed, 11 insertions, 11 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
index 11af5f58..e8c2ab8a 100644
--- a/src/client/qwaylanddisplay.cpp
+++ b/src/client/qwaylanddisplay.cpp
@@ -439,7 +439,7 @@ uint32_t QWaylandDisplay::currentTimeMillisec()
static void
sync_callback(void *data, struct wl_callback *callback, uint32_t serial)
{
- Q_UNUSED(serial)
+ Q_UNUSED(serial);
bool *done = static_cast<bool *>(data);
*done = true;
diff --git a/src/client/qwaylandshellsurface.cpp b/src/client/qwaylandshellsurface.cpp
index 91cc2c2c..1dfdfd5e 100644
--- a/src/client/qwaylandshellsurface.cpp
+++ b/src/client/qwaylandshellsurface.cpp
@@ -57,8 +57,8 @@ void QWaylandShellSurface::setWindowFlags(Qt::WindowFlags flags)
void QWaylandShellSurface::sendProperty(const QString &name, const QVariant &value)
{
- Q_UNUSED(name)
- Q_UNUSED(value)
+ Q_UNUSED(name);
+ Q_UNUSED(value);
}
}
diff --git a/src/client/qwaylandshellsurface_p.h b/src/client/qwaylandshellsurface_p.h
index 989cdb81..080d1385 100644
--- a/src/client/qwaylandshellsurface_p.h
+++ b/src/client/qwaylandshellsurface_p.h
@@ -86,7 +86,7 @@ public:
virtual void raise() {}
virtual void lower() {}
- virtual void setContentOrientationMask(Qt::ScreenOrientations orientation) { Q_UNUSED(orientation) }
+ virtual void setContentOrientationMask(Qt::ScreenOrientations orientation) { Q_UNUSED(orientation); }
virtual void sendProperty(const QString &name, const QVariant &value);
diff --git a/src/compositor/compositor_api/qwaylandpointer.cpp b/src/compositor/compositor_api/qwaylandpointer.cpp
index 9e8bfff1..3a3ecde4 100644
--- a/src/compositor/compositor_api/qwaylandpointer.cpp
+++ b/src/compositor/compositor_api/qwaylandpointer.cpp
@@ -393,7 +393,7 @@ uint32_t QWaylandPointer::toWaylandButton(Qt::MouseButton button)
void QWaylandPointer::enteredSurfaceDestroyed(void *data)
{
Q_D(QWaylandPointer);
- Q_UNUSED(data)
+ Q_UNUSED(data);
d->enteredSurfaceDestroyListener.reset();
d->enteredSurface = nullptr;
diff --git a/src/compositor/extensions/qwaylandwlshellintegration.cpp b/src/compositor/extensions/qwaylandwlshellintegration.cpp
index ef81aad3..4c4e2b89 100644
--- a/src/compositor/extensions/qwaylandwlshellintegration.cpp
+++ b/src/compositor/extensions/qwaylandwlshellintegration.cpp
@@ -98,8 +98,8 @@ void WlShellIntegration::handleSetDefaultTopLevel()
void WlShellIntegration::handleSetTransient(QWaylandSurface *parentSurface, const QPoint &relativeToParent, bool inactive)
{
- Q_UNUSED(parentSurface)
- Q_UNUSED(relativeToParent)
+ Q_UNUSED(parentSurface);
+ Q_UNUSED(relativeToParent);
// Take focus if the policy allows and it's not inactive
if (m_shellSurface->shell()->focusPolicy() == QWaylandShell::AutomaticFocus && !inactive)
diff --git a/tests/auto/client/shared_old/mockfullscreenshellv1.cpp b/tests/auto/client/shared_old/mockfullscreenshellv1.cpp
index 22c49cde..7463d23f 100644
--- a/tests/auto/client/shared_old/mockfullscreenshellv1.cpp
+++ b/tests/auto/client/shared_old/mockfullscreenshellv1.cpp
@@ -33,9 +33,9 @@ namespace Impl {
void FullScreenShellV1::zwp_fullscreen_shell_v1_present_surface(Resource *resource, struct ::wl_resource *surface, uint32_t method, struct ::wl_resource *output)
{
- Q_UNUSED(resource)
- Q_UNUSED(method)
- Q_UNUSED(output)
+ Q_UNUSED(resource);
+ Q_UNUSED(method);
+ Q_UNUSED(output);
m_surfaces.append(Surface::fromResource(surface));
}
diff --git a/tests/auto/client/tabletv2/tst_tabletv2.cpp b/tests/auto/client/tabletv2/tst_tabletv2.cpp
index 2cbafa35..f52db64f 100644
--- a/tests/auto/client/tabletv2/tst_tabletv2.cpp
+++ b/tests/auto/client/tabletv2/tst_tabletv2.cpp
@@ -289,7 +289,7 @@ void TabletV2::sendRemoved()
void TabletV2::zwp_tablet_v2_destroy(QtWaylandServer::zwp_tablet_v2::Resource *resource)
{
- Q_UNUSED(resource)
+ Q_UNUSED(resource);
if (m_tabletSeat) {
bool removed = m_tabletSeat->m_tabletsWaitingForDestroy.removeOne(this);
QVERIFY(removed);