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

Change-Id: Iff6ab3c287c58d8ec84a1513460bfce5218e8a61

1 files changed, 6 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 69ecbe160..e7ad5b107 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -64,6 +64,8 @@ public:
     RenderWidgetHostViewQuickItem(RenderWidgetHostViewQtDelegateClient *client) : m_client(client)
     {
         setFlag(ItemHasContents, true);
+        // Mark that this item should receive focus when the parent QQuickWidget receives focus.
+        setFocus(true);
     }
 protected:
     void focusInEvent(QFocusEvent *event) override
@@ -180,10 +182,14 @@ void RenderWidgetHostViewQtDelegateWidget::initAsPopup(const QRect& screenRect)
     setAttribute(Qt::WA_ShowWithoutActivating);
     setFocusPolicy(Qt::NoFocus);
 
+#ifdef Q_OS_MACOS
     // macOS doesn't like Qt::ToolTip when QWebEngineView is inside a modal dialog, specifically by
     // not forwarding click events to the popup. So we use Qt::Tool which behaves the same way, but
     // works on macOS too.
     setWindowFlags(Qt::Tool | Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus);
+#else
+    setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus);
+#endif
 
     setGeometry(screenRect);
     show();