[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 1f4374546859a951d59679b619ce02cb5592765d
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 5 08:40:52 2009 +0000

    Last Qt 4.5 build fix (*sigh*)
    
    Patch by Simon Hausmann <hausmann at webkit.org> on 2009-11-05
    * tests/qwebpage/tst_qwebpage.cpp:
    (inputMethodHints): inputMethodHints() is only used for
    Qt 4.6, so guard the whole function.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50556 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index fff3164..f3ea259 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,13 @@
 2009-11-05  Simon Hausmann  <hausmann at webkit.org>
 
+        Last Qt 4.5 build fix (*sigh*)
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (inputMethodHints): inputMethodHints() is only used for 
+        Qt 4.6, so guard the whole function.
+
+2009-11-05  Simon Hausmann  <hausmann at webkit.org>
+
         Another prospective build fix against Qt 4.5 (build bot)
 
         Don't compile & run the QGraphicsWebView portion of the
diff --git a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index ead25fb..4280ef4 100644
--- a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -1277,16 +1277,16 @@ void tst_QWebPage::inputMethods_data()
 #endif
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
 static Qt::InputMethodHints inputMethodHints(QObject* object)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
     if (QGraphicsObject* o = qobject_cast<QGraphicsObject*>(object))
         return o->inputMethodHints();
-#endif
     if (QWidget* w = qobject_cast<QWidget*>(object))
         return w->inputMethodHints();
     return Qt::InputMethodHints();
 }
+#endif
 
 static bool inputMethodEnabled(QObject* object)
 {

-- 
WebKit Debian packaging