[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 50212ec3abadc4013f3cf1e6c2d951183952571b
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 6 15:27:30 2009 +0000

    2009-10-06  Janne Koskinen  <janne.p.koskinen at digia.com>
    
            Reviewed by Simon Hausmann.
    
            [Qt] don't enable input methods on Symbian by default.
            https://bugs.webkit.org/show_bug.cgi?id=30117
    
            If input methods are enabled Symbian FEP will be launched on every
            pointer event making webpage navigation impossible with QWebView.
    
            * Api/qwebview.cpp:
            (QWebView::QWebView):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49188 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebview.cpp b/WebKit/qt/Api/qwebview.cpp
index fcf9cd4..25ad62d 100644
--- a/WebKit/qt/Api/qwebview.cpp
+++ b/WebKit/qt/Api/qwebview.cpp
@@ -209,7 +209,7 @@ QWebView::QWebView(QWidget *parent)
 {
     d = new QWebViewPrivate(this);
 
-#if !defined(Q_WS_QWS)
+#if !defined(Q_WS_QWS) && !defined(Q_OS_SYMBIAN)
     setAttribute(Qt::WA_InputMethodEnabled);
 #endif
 
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 395fa62..7a3feb1 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-06  Janne Koskinen  <janne.p.koskinen at digia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] don't enable input methods on Symbian by default.
+        https://bugs.webkit.org/show_bug.cgi?id=30117
+
+        If input methods are enabled Symbian FEP will be launched on every
+        pointer event making webpage navigation impossible with QWebView.
+
+        * Api/qwebview.cpp:
+        (QWebView::QWebView):
+
 2009-10-05  Holger Hans Peter Freyther  <zecke at selfish.org>
 
         Reviewed by Simon Hausmann.

-- 
WebKit Debian packaging