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

Conflicts:
	src/core/content_browser_client_qt.cpp
	src/core/content_browser_client_qt.h
	src/core/gl_surface_qt.cpp
	src/core/print_view_manager_qt.cpp
	src/core/web_contents_delegate_qt.cpp
	src/core/web_engine_context.cpp
	src/webengine/doc/src/qtwebengine-overview.qdoc
	src/webengine/doc/src/qtwebengine-platform-notes.qdoc
	src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
	src/webenginewidgets/webenginewidgets.pro
	sync.profile

Change-Id: I44495f4d899580c882d6b86d68d7f6b77c8e91f6

1 files changed, 7 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 b333c7b0e..eb3a3931a 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -55,6 +55,7 @@
 #include <QSGSimpleRectNode>
 #include <QSGSimpleTextureNode>
 #endif
+#include <private/qwidget_p.h>
 
 namespace QtWebEngineCore {
 
@@ -402,6 +403,12 @@ bool RenderWidgetHostViewQtDelegateWidget::event(QEvent *event)
         break;
     }
 
+    QEvent::Type type = event->type();
+    if (type == QEvent::FocusIn) {
+        QWidgetPrivate *d = QWidgetPrivate::get(this);
+        d->updateWidgetTransform(event);
+    }
+
     if (event->type() == QEvent::MouseButtonDblClick) {
         // QWidget keeps the Qt4 behavior where the DblClick event would replace the Press event.
         // QtQuick is different by sending both the Press and DblClick events for the second press