diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-05-11 11:42:08 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-05-11 17:02:43 +0200 |
| commit | a1b6a4c9edab853f06b870d9ef60a50b28ca36a6 (patch) | |
| tree | abcdf44e8cb1bed6339de3fd4d28b86e0a7dba4d /src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp | |
| parent | 18cc8aa2893e62f2b2679e67ed4747243e25da35 (diff) | |
| parent | 76a990cfa3409214530e77d132cdefd9e96685f9 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I122ca8d3438333c6b41f751c47b1ce1f9a7066b9
Diffstat (limited to 'src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp')
| -rw-r--r-- | src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp | 2 |
1 files changed, 1 insertions, 1 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 d615b0f9c..dba37cea7 100644 --- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp @@ -81,7 +81,7 @@ void RenderWidgetHostViewQtDelegateWidget::initAsChild(WebContentsAdapterClient* if (pagePrivate->view) { pagePrivate->view->layout()->addWidget(this); pagePrivate->view->setFocusProxy(this); - QOpenGLWidget::show(); + show(); } else setParent(0); } |