[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

andreas.kling at nokia.com andreas.kling at nokia.com
Wed Dec 22 15:17:58 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 8dad25f5b38c5d17face94342ee46a9b06ef7593
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 29 23:24:56 2010 +0000

    2010-10-29  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Ariya Hidayat.
    
            [Qt] QWebPage's InputMethod event handling calls ShortcutOverride handler too
            https://bugs.webkit.org/show_bug.cgi?id=48692
    
            * Api/qwebpage.cpp:
            (QWebPage::event): Add missing break statement.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70948 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index 76ccea6..40f41c5 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -2824,6 +2824,7 @@ bool QWebPage::event(QEvent *ev)
 #endif
     case QEvent::InputMethod:
         d->inputMethodEvent(static_cast<QInputMethodEvent*>(ev));
+        break;
     case QEvent::ShortcutOverride:
         d->shortcutOverrideEvent(static_cast<QKeyEvent*>(ev));
         break;
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index f621a57..98d6d45 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-29  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] QWebPage's InputMethod event handling calls ShortcutOverride handler too
+        https://bugs.webkit.org/show_bug.cgi?id=48692
+
+        * Api/qwebpage.cpp:
+        (QWebPage::event): Add missing break statement.
+
 2010-10-29  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Darin Adler.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list