[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit af3f8621f688c72e08d7ac833cdbdac707e8552f
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 6 18:55:17 2009 +0000

    2009-10-06  Benjamin C Meyer  <bmeyer at rim.com>
    
            Reviewed by Ariya Hidayat.
    
            When the drag data contains an image set it on the QDrag so it will be visible to the user.
    
            * WebCoreSupport/DragClientQt.cpp:
            (WebCore::DragClientQt::startDrag):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49200 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 6755e00..e764998 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-06  Benjamin C Meyer  <bmeyer at rim.com>
+
+        Reviewed by Ariya Hidayat.
+        
+        When the drag data contains an image set it on the QDrag so it will be visible to the user.
+        
+        * WebCoreSupport/DragClientQt.cpp:
+        (WebCore::DragClientQt::startDrag):
+
 2009-10-06  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebKit/qt/WebCoreSupport/DragClientQt.cpp b/WebKit/qt/WebCoreSupport/DragClientQt.cpp
index 0df0768..99e438d 100644
--- a/WebKit/qt/WebCoreSupport/DragClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/DragClientQt.cpp
@@ -66,6 +66,8 @@ void DragClientQt::startDrag(DragImageRef, const IntPoint&, const IntPoint&, Cli
     QWidget* view = m_webPage->view();
     if (view) {
         QDrag *drag = new QDrag(view);
+        if (clipboardData->hasImage())
+            drag->setPixmap(qvariant_cast<QPixmap>(clipboardData->imageData()));
         drag->setMimeData(clipboardData);
         drag->start();
     }

-- 
WebKit Debian packaging