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

update to use new dnd APIs

Browse Source 
For details see qtbase/10b3286313c78fa380b5fe676a7c14f3ae84f017

Change-Id: I197b2c158a0ffcb21cab973169c6257afa3d2c06
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
This commit is contained in:
Gatis Paeglis 2018-05-07 08:25:03 +02:00
parent d47119339b
commit b2a8bcb9c4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/platforms/wayland/qwaylanddnd.cpp
View File

@ -77,15 +77,19 @@ void QWaylandDrag::cancel()
m_display->currentInputDevice()->dataDevice()->cancelDrag(); 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(globalPos);
Q_UNUSED(b);
Q_UNUSED(mods);
// Do nothing // 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(globalPos);
Q_UNUSED(b);
Q_UNUSED(mods);
// Do nothing // Do nothing
} }

4
src/plugins/platforms/wayland/qwaylanddnd_p.h
View File

@ -78,8 +78,8 @@ public:
protected: protected:
void startDrag() override; void startDrag() override;
void cancel() override; void cancel() override;
void move(const QPoint &globalPos) override; void move(const QPoint &globalPos, Qt::MouseButtons b, Qt::KeyboardModifiers mods) override;
void drop(const QPoint &globalPos) override; void drop(const QPoint &globalPos, Qt::MouseButtons b, Qt::KeyboardModifiers mods) override;
void endDrag() override; void endDrag() override;