From fbe3acc7b2823f64c8f4e74233bb9fa8028f52bf Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 11 Jul 2016 11:42:10 +0200 Subject: Switch away from deprecated QSG*Node classes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the new public QSG classes meant to replace QSGSimpleRectNode and QSGSimpleTextureNode. Change-Id: Icdfc3b4ba13dd28258defa955d050927abbae95b Reviewed-by: Michael BrĂ¼ning --- .../render_widget_host_view_qt_delegate_widget.cpp | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp') 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 f1c0faf63..098e48b9d 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,11 @@ #include #include +#if (QT_VERSION < QT_VERSION_CHECK(5, 8, 0)) +#include +#include +#endif + namespace QtWebEngineCore { class RenderWidgetHostViewQuickItem : public QQuickItem { @@ -240,6 +245,24 @@ QSGInternalImageNode *RenderWidgetHostViewQtDelegateWidget::createImageNode() #endif } +QSGTextureNode *RenderWidgetHostViewQtDelegateWidget::createTextureNode() +{ +#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) + return quickWindow()->createImageNode(); +#else + return new QSGSimpleTextureNode(); +#endif +} + +QSGRectangleNode *RenderWidgetHostViewQtDelegateWidget::createRectangleNode() +{ +#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) + return quickWindow()->createRectangleNode(); +#else + return new QSGSimpleRectNode(); +#endif +} + void RenderWidgetHostViewQtDelegateWidget::update() { m_rootItem->update(); -- cgit v1.2.3