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

Also blacklist tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove()
and comboBoxPopupPositionAfterMove().

Conflicts:
	.qmake.conf
	src/3rdparty
	src/core/render_widget_host_view_qt.cpp
	src/core/resources/resources.gyp
	src/webengine/doc/src/qtwebengine-platform-notes.qdoc
	src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
	src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
	tests/auto/widgets/qwebenginepage/BLACKLIST
	tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
	tools/qmake/mkspecs/features/functions.prf

Task-number: QTBUG-55158
Change-Id: I1d73ac9b3ca5293ad3c7e3a56f4c395da930e6f4

1 files changed, 15 insertions, 1 deletions

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 098e48b9d..c7b825854 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -315,6 +315,13 @@ QVariant RenderWidgetHostViewQtDelegateWidget::inputMethodQuery(Qt::InputMethodQ
 void RenderWidgetHostViewQtDelegateWidget::resizeEvent(QResizeEvent *resizeEvent)
 {
     QQuickWidget::resizeEvent(resizeEvent);
+
+    const QPoint globalPos = mapToGlobal(pos());
+    if (globalPos != m_lastGlobalPos) {
+        m_lastGlobalPos = globalPos;
+        m_client->windowBoundsChanged();
+    }
+
     m_client->notifyResize();
 }
 
@@ -372,11 +379,17 @@ bool RenderWidgetHostViewQtDelegateWidget::event(QEvent *event)
         }
     }
 
-    // We forward focus events later, once they have made it to the m_rootItem.
     switch (event->type()) {
     case QEvent::FocusIn:
     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 (editorActionForKeyEvent(static_cast<QKeyEvent*>(event)) != QWebEnginePage::NoWebAction) {
+            event->accept();
+            return true;
+        }
+        break;
     default:
         break;
     }
@@ -400,6 +413,7 @@ bool RenderWidgetHostViewQtDelegateWidget::event(QEvent *event)
 
 void RenderWidgetHostViewQtDelegateWidget::onWindowPosChanged()
 {
+    m_lastGlobalPos = mapToGlobal(pos());
     m_client->windowBoundsChanged();
 }