diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-01-20 11:31:34 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-01-20 12:22:46 +0100 |
| commit | 8e3254696e043df4e31a4de2c413a9847ed2cf95 (patch) | |
| tree | 8b0244e205ee4791bc35315b8e1bdb2cbd760f92 | |
| parent | a757be35374ac1f496df524a715c46258554db7e (diff) | |
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 <simon.hausmann@digia.com>
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebpage.cpp | 11 |
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) |