[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[yael.aharon at nokia.com]

The following commit has been merged in the webkit-1.2 branch:
commit 70411ae0e223d5a40f4f91358aa9564c5464a998
Author: yael.aharon at nokia.com <yael.aharon at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 17 19:56:10 2009 +0000

    [Qt] QGLLauncher does not support drag&drop of local files
    https://bugs.webkit.org/show_bug.cgi?id=31057
    
    Reviewed by Kenneth Rohde Christiansen.
    
    Enable accepting files in QGraphicsWebView.
    
    * Api/qgraphicswebview.cpp:
    (QGraphicsWebView::QGraphicsWebView):
    (QGraphicsWebView::dragEnterEvent):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51083 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index 640a924..f46ee96 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -242,6 +242,7 @@ QGraphicsWebView::QGraphicsWebView(QGraphicsItem* parent)
 #if QT_VERSION >= 0x040600
     setFlag(QGraphicsItem::ItemUsesExtendedStyleOption, true);
 #endif
+    setAcceptDrops(true);
     setAcceptHoverEvents(true);
     setFocusPolicy(Qt::StrongFocus);
 }
@@ -875,10 +876,8 @@ bool QGraphicsWebView::focusNextPrevChild(bool next)
 void QGraphicsWebView::dragEnterEvent(QGraphicsSceneDragDropEvent* ev)
 {
 #ifndef QT_NO_DRAGANDDROP
-    //if (d->page)
-    //    d->page->event(ev);
-    //Just remove this line below when the code above is working
-    Q_UNUSED(ev);
+    if (d->page)
+        d->page->event(ev);
 #else
     Q_UNUSED(ev);
 #endif
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 454fc13..aac2d72 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-17  Yael Aharon  <yael.aharon at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] QGLLauncher does not support drag&drop of local files
+        https://bugs.webkit.org/show_bug.cgi?id=31057
+
+        Enable accepting files in QGraphicsWebView.
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebView::QGraphicsWebView):
+        (QGraphicsWebView::dragEnterEvent):
+
 2009-11-17  Antonio Gomes  <tonikitoo at webkit.org>
 
         Reviewed by Kenneth Christiansen.

-- 
WebKit Debian packaging