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

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 952ee726cf0cd1f2a7597e2c2f138eea12c7f91a
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 5 08:23:11 2009 +0000

    Prospective build fix against Qt 4.5 (build bot)
    
    Patch by Simon Hausmann <hausmann at webkit.org> on 2009-11-05
    * Api/qgraphicswebview.cpp:
    (QGraphicsWebViewPrivate::setInputMethodEnabled): Guard the
    use of Qt 4.6 specific API with #ifdefs.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50552 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index e1288bc..afc20dc 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -90,7 +90,9 @@ void QGraphicsWebViewPrivate::update(const QRect & dirtyRect)
 
 void QGraphicsWebViewPrivate::setInputMethodEnabled(bool enable)
 {
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
     q->setFlag(QGraphicsItem::ItemAcceptsInputMethod, enable);
+#endif
 }
 
 #if QT_VERSION >= 0x040600
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index e40c95c..8cf5141 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-05  Simon Hausmann  <hausmann at webkit.org>
+
+        Prospective build fix against Qt 4.5 (build bot)
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::setInputMethodEnabled): Guard the
+        use of Qt 4.6 specific API with #ifdefs.
+
 2009-11-01  Simon Hausmann  <hausmann at webkit.org>
 
         Reviewed by Kenneth Christiansen.

-- 
WebKit Debian packaging