summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-06-25 11:07:12 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-06-25 11:07:40 (GMT)
commit43a64353939cef7d8c0fbc3d976940f47e142cba (patch)
treecad7bd9933955e6f7026be42859fc97680e54d49 /src/3rdparty/webkit
parente5b8db6d4ecc244f7c35ea96a1f4e76fad47f1c4 (diff)
downloadQt-43a64353939cef7d8c0fbc3d976940f47e142cba.zip
Qt-43a64353939cef7d8c0fbc3d976940f47e142cba.tar.gz
Qt-43a64353939cef7d8c0fbc3d976940f47e142cba.tar.bz2
Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( e65b4879116f4a8b0ee8b09607eef666c68c61d6 )
Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-06-25 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by and done with Tor Arne Vestbø. Fix shortcut keyboard handling with plugins on the Qt/Mac build. When we receive shortcut events like Ctrl+V then the text in the QKeyEvent is empty. If we're asked to disambiguate the event into a Char keyboard event, we try to detect this situation and still set the text, to ensure that the general event handling sends a key press event after this disambiguation. * platform/qt/PlatformKeyboardEventQt.cpp: (WebCore::PlatformKeyboardEvent::disambiguateKeyDownEvent):
Diffstat (limited to 'src/3rdparty/webkit')
-rw-r--r--src/3rdparty/webkit/VERSION2
-rw-r--r--src/3rdparty/webkit/WebCore/ChangeLog14
-rw-r--r--src/3rdparty/webkit/WebCore/platform/qt/PlatformKeyboardEventQt.cpp9
3 files changed, 24 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 71add8f..e084e27 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -8,4 +8,4 @@ The commit imported was from the
and has the sha1 checksum
- 4552f381497b5adc18714d7f6e33eba678e3a9b2
+ e65b4879116f4a8b0ee8b09607eef666c68c61d6
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog
index 4b74dcb..c3b6c37 100644
--- a/src/3rdparty/webkit/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-06-25 Simon Hausmann <simon.hausmann@nokia.com>
+
+ Reviewed by and done with Tor Arne Vestbø.
+
+ Fix shortcut keyboard handling with plugins on the Qt/Mac build.
+
+ When we receive shortcut events like Ctrl+V then the text in the QKeyEvent is
+ empty. If we're asked to disambiguate the event into a Char keyboard event,
+ we try to detect this situation and still set the text, to ensure that the
+ general event handling sends a key press event after this disambiguation.
+
+ * platform/qt/PlatformKeyboardEventQt.cpp:
+ (WebCore::PlatformKeyboardEvent::disambiguateKeyDownEvent):
+
2009-06-23 Thiago Macieira <thiago.macieira@nokia.com>
Reviewed by Simon Hausmann.
diff --git a/src/3rdparty/webkit/WebCore/platform/qt/PlatformKeyboardEventQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/PlatformKeyboardEventQt.cpp
index 88cca5a..955da9b 100644
--- a/src/3rdparty/webkit/WebCore/platform/qt/PlatformKeyboardEventQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/qt/PlatformKeyboardEventQt.cpp
@@ -511,6 +511,15 @@ void PlatformKeyboardEvent::disambiguateKeyDownEvent(Type type, bool)
m_text = String();
m_unmodifiedText = String();
} else {
+ /*
+ When we receive shortcut events like Ctrl+V then the text in the QKeyEvent is
+ empty. If we're asked to disambiguate the event into a Char keyboard event,
+ we try to detect this situation and still set the text, to ensure that the
+ general event handling sends a key press event after this disambiguation.
+ */
+ if (m_text.isEmpty() && m_windowsVirtualKeyCode && m_qtEvent->key() < Qt::Key_Escape)
+ m_text.append(UChar(m_windowsVirtualKeyCode));
+
m_keyIdentifier = String();
m_windowsVirtualKeyCode = 0;
}