2011-03-29 Alexis Menard <alexis.menard@openbossa.org>
authoralexis.menard@openbossa.org <alexis.menard@openbossa.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 29 Mar 2011 13:33:00 +0000 (13:33 +0000)
committeralexis.menard@openbossa.org <alexis.menard@openbossa.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 29 Mar 2011 13:33:00 +0000 (13:33 +0000)
        Unreviewed build fix for build-webkit -minimal.

        Breakage introduced by http://trac.webkit.org/changeset/82238.
        The minimal option has no support for shortcuts.

        * WebCoreSupport/EditorClientQt.cpp:
        (WebCore::EditorClientQt::handleInputMethodKeydown):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@82243 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/qt/ChangeLog
Source/WebKit/qt/WebCoreSupport/EditorClientQt.cpp

index d95cdf4b8d6fd95a32e06cbba41b410c24272bdd..304a6c9abc8546b7201bdba8e8d2a58cab3dcd92 100644 (file)
@@ -1,3 +1,13 @@
+2011-03-29  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Unreviewed build fix for build-webkit -minimal.
+
+        Breakage introduced by http://trac.webkit.org/changeset/82238.
+        The minimal option has no support for shortcuts.
+
+        * WebCoreSupport/EditorClientQt.cpp:
+        (WebCore::EditorClientQt::handleInputMethodKeydown):
+
 2011-03-29  Janne Koskinen  <janne.p.koskinen@digia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
index f897e6cd5b49b4d5c81faa81e532be79397f6c30..e7bbd2cd90d9746bcd32e48d37433584d4c10cbd 100644 (file)
@@ -532,6 +532,7 @@ void EditorClientQt::handleKeyboardEvent(KeyboardEvent* event)
 
 void EditorClientQt::handleInputMethodKeydown(KeyboardEvent* event)
 {
+#ifndef QT_NO_SHORTCUT
     const PlatformKeyboardEvent* kevent = event->keyEvent();
     if (kevent->type() == PlatformKeyboardEvent::RawKeyDown) {
         QWebPage::WebAction action = QWebPagePrivate::editorActionForKeyEvent(kevent->qtEvent());
@@ -544,6 +545,7 @@ void EditorClientQt::handleInputMethodKeydown(KeyboardEvent* event)
             break;
         }
     }
+#endif
 }
 
 EditorClientQt::EditorClientQt(QWebPage* page)