From b2a8bcb9c431b470fb0d64ab51165ec46542b440 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Mon, 7 May 2018 08:25:03 +0200 Subject: [PATCH] update to use new dnd APIs For details see qtbase/10b3286313c78fa380b5fe676a7c14f3ae84f017 Change-Id: I197b2c158a0ffcb21cab973169c6257afa3d2c06 Reviewed-by: Johan Helsing --- src/plugins/platforms/wayland/qwaylanddnd.cpp | 8 ++++++-- src/plugins/platforms/wayland/qwaylanddnd_p.h | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/plugins/platforms/wayland/qwaylanddnd.cpp b/src/plugins/platforms/wayland/qwaylanddnd.cpp index fe620506d52..b01a9db3614 100644 --- a/src/plugins/platforms/wayland/qwaylanddnd.cpp +++ b/src/plugins/platforms/wayland/qwaylanddnd.cpp @@ -77,15 +77,19 @@ void QWaylandDrag::cancel() m_display->currentInputDevice()->dataDevice()->cancelDrag(); } -void QWaylandDrag::move(const QPoint &globalPos) +void QWaylandDrag::move(const QPoint &globalPos, Qt::MouseButtons b, Qt::KeyboardModifiers mods) { Q_UNUSED(globalPos); + Q_UNUSED(b); + Q_UNUSED(mods); // Do nothing } -void QWaylandDrag::drop(const QPoint &globalPos) +void QWaylandDrag::drop(const QPoint &globalPos, Qt::MouseButtons b, Qt::KeyboardModifiers mods) { Q_UNUSED(globalPos); + Q_UNUSED(b); + Q_UNUSED(mods); // Do nothing } diff --git a/src/plugins/platforms/wayland/qwaylanddnd_p.h b/src/plugins/platforms/wayland/qwaylanddnd_p.h index 04b39826c27..474fe2ab105 100644 --- a/src/plugins/platforms/wayland/qwaylanddnd_p.h +++ b/src/plugins/platforms/wayland/qwaylanddnd_p.h @@ -78,8 +78,8 @@ public: protected: void startDrag() override; void cancel() override; - void move(const QPoint &globalPos) override; - void drop(const QPoint &globalPos) override; + void move(const QPoint &globalPos, Qt::MouseButtons b, Qt::KeyboardModifiers mods) override; + void drop(const QPoint &globalPos, Qt::MouseButtons b, Qt::KeyboardModifiers mods) override; void endDrag() override;