[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit dd917ac9eca807c1ad99c9529359c3e0552417f7
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 29 16:25:18 2010 +0000

    Disable auto-uppercase and predictive text on Maemo5, just like the
    build-in MicroB Browser.
    
    Reviewed by Simon Hausmann
    
    * WebCoreSupport/EditorClientQt.cpp:
    (WebCore::EditorClientQt::setInputMethodState):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54064 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 1f7f201..67e76dc 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-29  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Simon Hausmann
+
+        Disable auto-uppercase and predictive text on Maemo5, just like the
+        build-in MicroB Browser.
+
+        * WebCoreSupport/EditorClientQt.cpp:
+        (WebCore::EditorClientQt::setInputMethodState):
+
 2010-01-28  Andreas Kling  <andreas.kling at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit/qt/WebCoreSupport/EditorClientQt.cpp b/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
index 3091a43..90ebb1d 100644
--- a/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
@@ -625,7 +625,12 @@ void EditorClientQt::setInputMethodState(bool active)
             }
         }
         webPageClient->setInputMethodHint(Qt::ImhHiddenText, isPasswordField);
-#endif
+#ifdef Q_WS_MAEMO_5
+        // Maemo 5 MicroB Browser disables auto-uppercase and predictive text, thus, so do we.
+        webPageClient->setInputMethodHint(Qt::ImhNoAutoUppercase, true);
+        webPageClient->setInputMethodHint(Qt::ImhNoPredictiveText, true);
+#endif // Q_WS_MAEMO_5
+#endif // QT_VERSION check
         webPageClient->setInputMethodEnabled(active);
     }
     emit m_page->microFocusChanged();

-- 
WebKit Debian packaging