From: Jørgen Lind <jorgen.lind@nokia.com>
Date: Thu, 1 Mar 2012 08:34:24 +0000 (+0100)
Subject: Compile fix for the new DND interfaces
X-Git-Tag: qt-v5.0.0-alpha1~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=524296fc22bb9947e22ca205686fef07a9c1419b;p=profile%2Fivi%2Fqtwayland.git

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>
---

diff --git a/src/plugins/platforms/wayland/qwaylanddnd.cpp b/src/plugins/platforms/wayland/qwaylanddnd.cpp
index b1b3880..4276759 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 6f7018f..92f7297 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);