summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Source/WebKit/qt/WidgetApi/qwebpage.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.cpp b/Source/WebKit/qt/WidgetApi/qwebpage.cpp
index f798aff3b..bbe6769c1 100644
--- a/Source/WebKit/qt/WidgetApi/qwebpage.cpp
+++ b/Source/WebKit/qt/WidgetApi/qwebpage.cpp
@@ -949,13 +949,14 @@ QPalette QWebPage::palette() const
void QWebPagePrivate::shortcutOverrideEvent(QKeyEvent* event)
{
- if (handleShortcutOverrideEvent(event))
- return;
+ if (handleShortcutOverrideEvent(event)) {
+ if (event->isAccepted())
+ return;
#ifndef QT_NO_SHORTCUT
- if (editorActionForKeyEvent(event) != QWebPage::NoWebAction)
- event->accept();
+ else if (editorActionForKeyEvent(event) != QWebPage::NoWebAction)
+ event->accept();
#endif
-
+ }
}
bool QWebPagePrivate::gestureEvent(QGestureEvent* event)