diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-27 14:01:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-27 19:52:48 +0000 |
| commit | b737f3fa3d34c97aed10863c27fe98664c427225 (patch) | |
| tree | bd45e1a432dfba60429bb39dc278a0686b94923e /src/core | |
| parent | 42e7196ca37c688eaadb55aba25e2bb56845a5ab (diff) | |
Fix build with newer qtdeclarative
What was previous called QSGImageNode is now
QSGInternalImageNode
Task-number: QTBUG-54312
Change-Id: Iec286765bea5598d86932c81bfd122461a2e9884
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/delegated_frame_node.cpp | 2 | ||||
| -rw-r--r-- | src/core/render_widget_host_view_qt_delegate.h | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/core/delegated_frame_node.cpp b/src/core/delegated_frame_node.cpp index ad1aff6d4..8b635d912 100644 --- a/src/core/delegated_frame_node.cpp +++ b/src/core/delegated_frame_node.cpp @@ -539,7 +539,7 @@ void DelegatedFrameNode::commit(ChromiumCompositorData *chromiumCompositorData, continue; // Only QSGImageNode currently supports QSGLayer textures. - QSGImageNode *imageNode = apiDelegate->createImageNode(); + QSGInternalImageNode *imageNode = apiDelegate->createImageNode(); imageNode->setTargetRect(toQt(quad->rect)); imageNode->setInnerTargetRect(toQt(quad->rect)); imageNode->setTexture(layer); diff --git a/src/core/render_widget_host_view_qt_delegate.h b/src/core/render_widget_host_view_qt_delegate.h index ce6ec730a..151f49bf6 100644 --- a/src/core/render_widget_host_view_qt_delegate.h +++ b/src/core/render_widget_host_view_qt_delegate.h @@ -49,13 +49,20 @@ QT_BEGIN_NAMESPACE class QCursor; class QEvent; class QPainter; -class QSGImageNode; class QSGLayer; class QSGNode; class QSGTexture; class QVariant; class QWindow; class QInputMethodEvent; + +#if (QT_VERSION < QT_VERSION_CHECK(5, 8, 0)) +class QSGImageNode; +typedef QSGImageNode QSGInternalImageNode; +#else +class QSGInternalImageNode; +#endif + QT_END_NAMESPACE namespace QtWebEngineCore { @@ -92,7 +99,7 @@ public: virtual QWindow* window() const = 0; virtual QSGTexture *createTextureFromImage(const QImage &) = 0; virtual QSGLayer *createLayer() = 0; - virtual QSGImageNode *createImageNode() = 0; + virtual QSGInternalImageNode *createImageNode() = 0; virtual void update() = 0; virtual void updateCursor(const QCursor &) = 0; virtual void resize(int width, int height) = 0; |