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

[vestbo at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit d2ef80201836dedb2d7c4d89a3bc76af6e797e1d
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 9 13:10:37 2009 +0000

    Added a missing re-implementation of QGraphicsItem::inputMethodQuery().
    
    Patch by Simon Hausmann <hausmann at webkit.org> on 2009-11-05
    Reviewed by Tor Arne Vestbø.
    
    * Api/qgraphicswebview.cpp:
    (QGraphicsWebView::inputMethodQuery):
    * Api/qgraphicswebview.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50652 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index f0ace46..0365181 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -260,6 +260,15 @@ QSizeF QGraphicsWebView::sizeHint(Qt::SizeHint which, const QSizeF& constraint)
 
 /*! \reimp
 */
+QVariant QGraphicsWebView::inputMethodQuery(Qt::InputMethodQuery query) const
+{
+    if (d->page)
+        return d->page->inputMethodQuery(query);
+    return QVariant();
+}
+
+/*! \reimp
+*/
 bool QGraphicsWebView::event(QEvent* event)
 {
     // Re-implemented in order to allows fixing event-related bugs in patch releases.
diff --git a/WebKit/qt/Api/qgraphicswebview.h b/WebKit/qt/Api/qgraphicswebview.h
index 9d14ccb..f3afb4c 100644
--- a/WebKit/qt/Api/qgraphicswebview.h
+++ b/WebKit/qt/Api/qgraphicswebview.h
@@ -87,6 +87,8 @@ public:
 
     virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF& constraint) const;
 
+    virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
+
 public Q_SLOTS:
     void stop();
     void back();
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 8df03e7..d605b9f 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-05  Simon Hausmann  <hausmann at webkit.org>
+
+        Reviewed by Tor Arne Vestbø.
+
+        Added a missing re-implementation of QGraphicsItem::inputMethodQuery().
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebView::inputMethodQuery):
+        * Api/qgraphicswebview.h:
+
 2009-11-04  Simon Hausmann  <hausmann at webkit.org>
 
         Reviewed by Tor Arne Vestbø.

-- 
WebKit Debian packaging