diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-11 11:42:10 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-07-14 21:51:01 +0000 |
| commit | fbe3acc7b2823f64c8f4e74233bb9fa8028f52bf (patch) | |
| tree | ccc8f78e5c446343d8b4ac919fd174d9bf4a20d5 /src/webenginewidgets | |
| parent | f1f6700b4c15b44c7d5e0f773a8b9b77915098d6 (diff) | |
Switch away from deprecated QSG*Node classes
Use the new public QSG classes meant to replace QSGSimpleRectNode and
QSGSimpleTextureNode.
Change-Id: Icdfc3b4ba13dd28258defa955d050927abbae95b
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/webenginewidgets')
| -rw-r--r-- | src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp | 23 | ||||
| -rw-r--r-- | src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h | 2 |
2 files changed, 25 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 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 <QWindow> #include <private/qquickwindow_p.h> +#if (QT_VERSION < QT_VERSION_CHECK(5, 8, 0)) +#include <QSGSimpleRectNode> +#include <QSGSimpleTextureNode> +#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(); diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h index 1de67a70b..29cac82db 100644 --- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h @@ -68,6 +68,8 @@ public: virtual QSGTexture *createTextureFromImage(const QImage &) Q_DECL_OVERRIDE; virtual QSGLayer *createLayer() Q_DECL_OVERRIDE; virtual QSGInternalImageNode *createImageNode() Q_DECL_OVERRIDE; + virtual QSGTextureNode *createTextureNode() Q_DECL_OVERRIDE; + virtual QSGRectangleNode *createRectangleNode() Q_DECL_OVERRIDE; virtual void update() Q_DECL_OVERRIDE; virtual void updateCursor(const QCursor &) Q_DECL_OVERRIDE; virtual void resize(int width, int height) Q_DECL_OVERRIDE; |