summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2012-03-01 09:34:24 +0100
committerSamuel Rødal <samuel.rodal@nokia.com>2012-03-01 09:37:56 +0100
commit524296fc22bb9947e22ca205686fef07a9c1419b (patch)
treebb9c55d44530a18894b3cf52c3bdd7658fb44854
parentf6f4e8a87de9b4330660057a2f4ed99f9d892cee (diff)
Compile fix for the new DND interfaces
This doesn't mean the DND works for the wayland plugin yet Change-Id: I6a4ae57e4b19dcedaf10119e033d5cbead8cb19d Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
-rw-r--r--src/plugins/platforms/wayland/qwaylanddnd.cpp5
-rw-r--r--src/plugins/platforms/wayland/qwaylanddnd.h2
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);