1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ; to Q_UNUSED

Browse Source 
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>
This commit is contained in:
Lars Schmertmann 2020-06-27 13:03:01 +02:00
parent 2b827691dc
commit a15ab03734
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/qwaylanddisplay.cpp
View File

@ -439,7 +439,7 @@ uint32_t QWaylandDisplay::currentTimeMillisec()
static void static void
sync_callback(void *data, struct wl_callback *callback, uint32_t serial) sync_callback(void *data, struct wl_callback *callback, uint32_t serial)
{ {
Q_UNUSED(serial) Q_UNUSED(serial);
bool *done = static_cast<bool *>(data); bool *done = static_cast<bool *>(data);
*done = true; *done = true;

4
src/plugins/platforms/wayland/qwaylandshellsurface.cpp
View File

@ -57,8 +57,8 @@ void QWaylandShellSurface::setWindowFlags(Qt::WindowFlags flags)
void QWaylandShellSurface::sendProperty(const QString &name, const QVariant &value) void QWaylandShellSurface::sendProperty(const QString &name, const QVariant &value)
{ {
Q_UNUSED(name) Q_UNUSED(name);
Q_UNUSED(value) Q_UNUSED(value);
} }
} }

2
src/plugins/platforms/wayland/qwaylandshellsurface_p.h
View File

@ -86,7 +86,7 @@ public:
virtual void raise() {} virtual void raise() {}
virtual void lower() {} 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); virtual void sendProperty(const QString &name, const QVariant &value);

6
tests/auto/wayland/shared_old/mockfullscreenshellv1.cpp
View File

@ -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) 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(resource);
Q_UNUSED(method) Q_UNUSED(method);
Q_UNUSED(output) Q_UNUSED(output);
m_surfaces.append(Surface::fromResource(surface)); m_surfaces.append(Surface::fromResource(surface));
} }

2
tests/auto/wayland/tabletv2/tst_tabletv2.cpp
View File

@ -289,7 +289,7 @@ void TabletV2::sendRemoved()
void TabletV2::zwp_tablet_v2_destroy(QtWaylandServer::zwp_tablet_v2::Resource *resource) void TabletV2::zwp_tablet_v2_destroy(QtWaylandServer::zwp_tablet_v2::Resource *resource)
{ {
Q_UNUSED(resource) Q_UNUSED(resource);
if (m_tabletSeat) { if (m_tabletSeat) {
bool removed = m_tabletSeat->m_tabletsWaitingForDestroy.removeOne(this); bool removed = m_tabletSeat->m_tabletsWaitingForDestroy.removeOne(this);
QVERIFY(removed); QVERIFY(removed);