[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[commit-queue at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 26ceae3a1690bbfbc2abd6c1266d1b5b0ee6eafd
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 14 20:43:49 2011 +0000

    2011-01-14  Konstantin Tokarev  <annulen at yandex.ru>
    
            Reviewed by Laszlo Gombos.
    
            [Qt] Fixed compilation when QT_NO_SHORTCUT is defined
            https://bugs.webkit.org/show_bug.cgi?id=52460
    
            This patch fixes compilation when QT_NO_SHORTCUT is defined in Qt
            configuration.
    
            * WebCoreSupport/EditorClientQt.cpp:
            (WebCore::EditorClientQt::handleKeyboardEvent): Added QT_NO_SHORTCUT guards
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75812 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 4169459..46a8e6c 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-14  Konstantin Tokarev  <annulen at yandex.ru>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Fixed compilation when QT_NO_SHORTCUT is defined
+        https://bugs.webkit.org/show_bug.cgi?id=52460
+
+        This patch fixes compilation when QT_NO_SHORTCUT is defined in Qt
+        configuration.
+
+        * WebCoreSupport/EditorClientQt.cpp:
+        (WebCore::EditorClientQt::handleKeyboardEvent): Added QT_NO_SHORTCUT guards
+
 2011-01-13  Viatcheslav Ostapenko  <ostapenko.viatcheslav at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKit/qt/WebCoreSupport/EditorClientQt.cpp b/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
index 534e334..ed6bc45 100644
--- a/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
@@ -443,8 +443,9 @@ void EditorClientQt::handleKeyboardEvent(KeyboardEvent* event)
             m_page->triggerAction(action);
             event->setDefaultHandled();
             return;
-        } else {
+        } else 
 #endif // QT_NO_SHORTCUT
+        {
             String commandName = editorCommandForKeyDownEvent(event);
             if (!commandName.isEmpty()) {
                 if (frame->editor()->command(commandName).execute()) // Event handled.
@@ -495,10 +496,12 @@ void EditorClientQt::handleKeyboardEvent(KeyboardEvent* event)
         case VK_HOME:
         case VK_END:
             {
+#ifndef QT_NO_SHORTCUT
                 QWebPage::WebAction action = QWebPagePrivate::editorActionForKeyEvent(kevent->qtEvent());
                 ASSERT(action != QWebPage::NoWebAction);
                 m_page->triggerAction(action);
                 event->setDefaultHandled();
+#endif
                 return;
             }
         case VK_PRIOR: // PageUp

-- 
WebKit Debian packaging