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

Conflicts:
	src/3rdparty
	src/core/resources/resources.gyp
	src/webengine/doc/src/qtwebengine-overview.qdoc
	src/webenginewidgets/api/qwebenginepage.cpp
	src/webenginewidgets/api/qwebenginescriptcollection.cpp
	src/webenginewidgets/api/qwebenginescriptcollection_p.h
	tests/auto/widgets/qwebenginepage/BLACKLIST

And readded newly in 5.6 enabled tests to the BLACKLIST.

Change-Id: I4ab1fc54ebfaaf940df81b0d8d6bdd15cae8b7c4

1 files changed, 8 insertions, 0 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 f0385a252..28c40fed5 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -269,6 +269,13 @@ QVariant RenderWidgetHostViewQtDelegateWidget::inputMethodQuery(Qt::InputMethodQ
 void RenderWidgetHostViewQtDelegateWidget::resizeEvent(QResizeEvent *resizeEvent)
 {
     QOpenGLWidget::resizeEvent(resizeEvent);
+
+    const QPoint globalPos = mapToGlobal(pos());
+    if (globalPos != m_lastGlobalPos) {
+        m_lastGlobalPos = globalPos;
+        m_client->windowBoundsChanged();
+    }
+
     m_client->notifyResize();
 }
 
@@ -387,6 +394,7 @@ void RenderWidgetHostViewQtDelegateWidget::paintGL()
 
 void RenderWidgetHostViewQtDelegateWidget::onWindowPosChanged()
 {
+    m_lastGlobalPos = mapToGlobal(pos());
     m_client->windowBoundsChanged();
 }