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

Also apply a4b04e4c on src/webengine/doc/src/qtwebengine-deploying.qdoc,
use the macro \macos.

Conflicts:
	src/core/media_capture_devices_dispatcher.cpp
	src/webengine/doc/src/qtwebengine-deploying.qdoc
	src/webengine/doc/src/qtwebengine-platform-notes.qdoc

Change-Id: Ia6092a56bfe23da7c06f5389718ebbc9b78ef820

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 28c40fed5..23a203eab 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -51,6 +51,7 @@
 #include <QWindow>
 #include <private/qsgcontext_p.h>
 #include <private/qsgengine_p.h>
+#include <private/qwidget_p.h>
 
 namespace QtWebEngineCore {
 
@@ -340,6 +341,12 @@ bool RenderWidgetHostViewQtDelegateWidget::event(QEvent *event)
         }
     }
 
+    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