Merge remote-tracking branch 'origin/5.10' into dev

 Conflicts:
	src/core/web_event_factory.cpp
	src/core/web_event_factory.h
	src/webengine/render_widget_host_view_qt_delegate_quick.h

Change-Id: Ic43787e2689c81b501ed395a990190eb67d83a2b

1 files changed, 1 insertions, 34 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index e11147760..0636d8471 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -95,27 +95,6 @@
 QT_BEGIN_NAMESPACE
 using namespace QtWebEngineCore;
 
-QQuickWebEngineView::WebAction editorActionForKeyEvent(QKeyEvent* event)
-{
-    static struct {
-        QKeySequence::StandardKey standardKey;
-        QQuickWebEngineView::WebAction action;
-    } editorActions[] = {
-        { QKeySequence::Cut, QQuickWebEngineView::Cut },
-        { QKeySequence::Copy, QQuickWebEngineView::Copy },
-        { QKeySequence::Paste, QQuickWebEngineView::Paste },
-        { QKeySequence::Undo, QQuickWebEngineView::Undo },
-        { QKeySequence::Redo, QQuickWebEngineView::Redo },
-        { QKeySequence::SelectAll, QQuickWebEngineView::SelectAll },
-        { QKeySequence::UnknownKey, QQuickWebEngineView::NoWebAction }
-    };
-    for (int i = 0; editorActions[i].standardKey != QKeySequence::UnknownKey; ++i)
-        if (event == editorActions[i].standardKey)
-            return editorActions[i].action;
-
-    return QQuickWebEngineView::NoWebAction;
-}
-
 #ifndef QT_NO_ACCESSIBILITY
 static QAccessibleInterface *webAccessibleFactory(const QString &, QObject *object)
 {
@@ -360,7 +339,7 @@ void QQuickWebEngineViewPrivate::navigationRequested(int navigationType, const Q
     Q_EMIT q->navigationRequested(&navigationRequest);
 
     navigationRequestAction = navigationRequest.action();
-    if ((navigationRequestAction == WebContentsAdapterClient::AcceptRequest) && adapter)
+    if ((navigationRequestAction == WebContentsAdapterClient::AcceptRequest) && adapter && adapter->isFindTextInProgress())
         adapter->stopFinding();
 }
 
@@ -579,18 +558,6 @@ void QQuickWebEngineViewPrivate::focusContainer()
 void QQuickWebEngineViewPrivate::unhandledKeyEvent(QKeyEvent *event)
 {
     Q_Q(QQuickWebEngineView);
-#ifdef Q_OS_OSX
-    if (event->type() == QEvent::KeyPress) {
-        QQuickWebEngineView::WebAction action = editorActionForKeyEvent(event);
-        if (action != QQuickWebEngineView::NoWebAction) {
-            // Try triggering a registered short-cut
-            if (QGuiApplicationPrivate::instance()->shortcutMap.tryShortcut(event))
-                return;
-            q->triggerWebAction(action);
-            return;
-        }
-    }
-#endif
     if (q->parentItem())
         QCoreApplication::sendEvent(q->parentItem(), event);
 }