a dragLeave event is not the same as cancelling a drag.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27310 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index 9f0f01b35869b8c72a2c5282c3fd016929941986..6d04d8747c9a827680a9d98d2591115b0c65d4af 100644 (file)
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -68,7 +68,8 @@
 using namespace WebCore;
 
 QWebPagePrivate::QWebPagePrivate(QWebPage *qq)
-    : q(qq), modified(false)
+    : q(qq)
+    , modified(false)
 {
     q->setMouseTracking(true);
     q->setFocusPolicy(Qt::ClickFocus);
@@ -601,11 +602,7 @@ void QWebPage::dragEnterEvent(QDragEnterEvent *ev)
 
 void QWebPage::dragLeaveEvent(QDragLeaveEvent *ev)
 {
-#ifndef QT_NO_DRAGANDDROP
-    DragData dragData(0, IntPoint(), QCursor::pos(), DragOperationNone);
-    d->page->dragController()->dragExited(&dragData);
-    ev->accept();
-#endif
+    // nothing to do here for the moment
 }
 
 void QWebPage::dragMoveEvent(QDragMoveEvent *ev)

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index a6332b5ab68805aa0b096c403bc535e6f1bce8bb..ed862791a709ef247fa4ed93d8c1ba84deec4709 100644 (file)
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-31  Lars Knoll  <lars@trolltech.com>
+
+        Reviewed by Simon.
+
+        a dragLeave event is not the same as cancelling a drag.
+
+        * Api/qwebpage.cpp:
+
 2007-10-26  Mark Rowe  <mrowe@apple.com>
 
         Build fix.  Add missing #include of Platform.h.