summaryrefslogtreecommitdiffstats
path: root/src/webenginewidgets
diff options
context:
space:
mode:
authorJüri Valdmann <juri.valdmann@qt.io>2018-05-15 16:21:04 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-15 20:05:02 +0000
commitce01bf795b5a50e28e119d1925b395b8bfcf419b (patch)
treedfb1462f597200f9c2919090fa839c18a3b1c305 /src/webenginewidgets
parentd7a1ea4a6b38d2818d44da378f25cd42e1472286 (diff)
Remove old focusProxy widget from layout in RWHVQDW::initAsChild
Task-number: QTBUG-68224 Change-Id: I317915f0c81531e5858dfa3a76365b16266ce919 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webenginewidgets')
-rw-r--r--src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp3
1 files changed, 3 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 16ea216f2..56f04d424 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -198,6 +198,9 @@ void RenderWidgetHostViewQtDelegateWidget::initAsChild(WebContentsAdapterClient*
disconnect(parentWidget(), &QObject::destroyed,
this, &RenderWidgetHostViewQtDelegateWidget::removeParentBeforeParentDelete);
pagePrivate->view->layout()->addWidget(this);
+ if (QWidget *focusProxy = pagePrivate->view->focusProxy())
+ if (focusProxy != this)
+ pagePrivate->view->layout()->removeWidget(focusProxy);
pagePrivate->view->setFocusProxy(this);
show();
} else