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

6 files changed, 14 insertions, 23 deletions

diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index dc525db93..4a892103d 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -376,19 +376,6 @@ void QWebEnginePagePrivate::focusContainer()
 
 void QWebEnginePagePrivate::unhandledKeyEvent(QKeyEvent *event)
 {
-#ifdef Q_OS_OSX
-    Q_Q(QWebEnginePage);
-    if (event->type() == QEvent::KeyPress) {
-        QWebEnginePage::WebAction action = editorActionForKeyEvent(event);
-        if (action != QWebEnginePage::NoWebAction) {
-            // Try triggering a registered short-cut
-            if (QGuiApplicationPrivate::instance()->shortcutMap.tryShortcut(event))
-                return;
-            q->triggerAction(action);
-            return;
-        }
-    }
-#endif
     if (view && view->parentWidget())
         QGuiApplication::sendEvent(view->parentWidget(), event);
 }
@@ -1521,7 +1508,7 @@ void QWebEnginePagePrivate::navigationRequested(int navigationType, const QUrl &
 {
     Q_Q(QWebEnginePage);
     bool accepted = q->acceptNavigationRequest(url, static_cast<QWebEnginePage::NavigationType>(navigationType), isMainFrame);
-    if (accepted && adapter)
+    if (accepted && adapter && adapter->isFindTextInProgress())
         adapter->stopFinding();
     navigationRequestAction = accepted ? WebContentsAdapterClient::AcceptRequest : WebContentsAdapterClient::IgnoreRequest;
 }
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
index 47370a63c..eb91d576d 100644
--- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
@@ -550,6 +550,9 @@
     This signal is emitted whenever the selection changes, either interactively
     or programmatically. For example, by calling triggerAction() with a selection action.
 
+    \note When using the mouse to select text by left-clicking and dragging, the signal will be
+    emitted for each new character selected, and not upon releasing the left mouse button.
+
     \sa selectedText()
 */
 
diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
index 2f33d2e7a..8bd8227ec 100644
--- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
@@ -163,7 +163,8 @@
             origins to access Geolocation again.
             Disabled by default. (Added in Qt 5.9)
     \value  AllowWindowActivationFromJavaScript
-            Allows the window.focus() method in JavaScript. Disallowed by default.
+            Allows activating windows by using the window.focus() JavaScript
+            method. Disabled by default.
             (Added in Qt 5.10)
     \value  ShowScrollBars
             Shows scroll bars.
diff --git a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
index 34a61ded3..27ee96c5e 100644
--- a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
@@ -366,6 +366,9 @@
 
     This signal is emitted whenever the selection changes.
 
+    \note When using the mouse to select text by left-clicking and dragging, the signal will be
+    emitted for each new character selected, and not upon releasing the left mouse button.
+
     \sa selectedText()
 */
 
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
index 69e1c3038..8dd5c158b 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -67,7 +67,8 @@ protected:
     bool event(QEvent *event) override
     {
         if (event->type() == QEvent::ShortcutOverride)
-            return m_client->handleShortcutOverrideEvent(static_cast<QKeyEvent *>(event));
+            return m_client->forwardEvent(event);
+
         return QQuickItem::event(event);
     }
     void focusInEvent(QFocusEvent *event) override
@@ -448,10 +449,6 @@ bool RenderWidgetHostViewQtDelegateWidget::event(QEvent *event)
     case QEvent::FocusOut:
         // We forward focus events later, once they have made it to the m_rootItem.
         return QQuickWidget::event(event);
-    case QEvent::ShortcutOverride:
-        if (m_client->handleShortcutOverrideEvent(static_cast<QKeyEvent *>(event)))
-            return true;
-        break;
     case QEvent::DragEnter:
     case QEvent::DragLeave:
     case QEvent::DragMove:
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro
index 958dec07b..37cb7a1f0 100644
--- a/src/webenginewidgets/webenginewidgets.pro
+++ b/src/webenginewidgets/webenginewidgets.pro
@@ -46,17 +46,17 @@ HEADERS = \
         api/qwebengineview_p.h \
         render_widget_host_view_qt_delegate_widget.h
 
-qtConfig(ui-delegates) {
+qtConfig(webengine-ui-delegates) {
     SOURCES += ui/messagebubblewidget.cpp
     HEADERS += ui/messagebubblewidget_p.h
     DEFINES += QT_UI_DELEGATES
 }
 
-qtConfig(spellchecker) {
+qtConfig(webengine-spellchecker) {
     DEFINES += ENABLE_SPELLCHECK
 }
 
-qtConfig(printing-and-pdf) {
+qtConfig(webengine-printing-and-pdf) {
     DEFINES += ENABLE_PRINTING
     DEFINES += ENABLE_PDF
     QT += printsupport