From 8e3254696e043df4e31a4de2c413a9847ed2cf95 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 20 Jan 2015 11:31:34 +0100 Subject: Editor actions should only be checked when page is editable In the split of qt4 QWebPage the check for GUI level editor actions was incorrectly moved to being checked when the page is not editable instead of when it is editable Task-number: QTBUG-44019 Change-Id: I3776cec6ee05f27e43139e40cc18480905300888 Reviewed-by: Simon Hausmann --- Source/WebKit/qt/WidgetApi/qwebpage.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Source/WebKit/qt/WidgetApi/qwebpage.cpp') 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) -- cgit v1.2.1