From 524296fc22bb9947e22ca205686fef07a9c1419b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Thu, 1 Mar 2012 09:34:24 +0100 Subject: Compile fix for the new DND interfaces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This doesn't mean the DND works for the wayland plugin yet Change-Id: I6a4ae57e4b19dcedaf10119e033d5cbead8cb19d Reviewed-by: Samuel Rødal --- src/plugins/platforms/wayland/qwaylanddnd.cpp | 5 +++-- src/plugins/platforms/wayland/qwaylanddnd.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/platforms/wayland/qwaylanddnd.cpp b/src/plugins/platforms/wayland/qwaylanddnd.cpp index b1b388094..42767590a 100644 --- a/src/plugins/platforms/wayland/qwaylanddnd.cpp +++ b/src/plugins/platforms/wayland/qwaylanddnd.cpp @@ -59,9 +59,10 @@ QMimeData * QWaylandDrag::platformDropData() return m_display->dndSelectionHandler()->dragMime(); } -void QWaylandDrag::startDrag(QDrag *drag) +Qt::DropAction QWaylandDrag::drag(QDrag *m_drag) { - m_display->dndSelectionHandler()->createAndSetDrag(drag); +// m_display->dndSelectionHandler()->createAndSetDrag(drag); + return Qt::IgnoreAction; } void QWaylandDrag::move(const QMouseEvent *me) diff --git a/src/plugins/platforms/wayland/qwaylanddnd.h b/src/plugins/platforms/wayland/qwaylanddnd.h index 6f7018fb7..92f7297c9 100644 --- a/src/plugins/platforms/wayland/qwaylanddnd.h +++ b/src/plugins/platforms/wayland/qwaylanddnd.h @@ -55,7 +55,7 @@ public: QMimeData *platformDropData(); - void startDrag(QDrag *drag); + Qt::DropAction drag(QDrag *m_drag); void move(const QMouseEvent *me); bool canDrop() const; void drop(const QMouseEvent *me); -- cgit v1.2.3