From 3b24c024f2606cd93b1f397338f349582003c2ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCri=20Valdmann?= Date: Tue, 25 Apr 2017 12:42:27 +0200 Subject: Fix undeclared use of QSGFlatColorMaterial when QT_NO_OPENGL is defined MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QtWebEngine fails to build with -no-opengl due to src/core/delegated_frame_node.cpp trying to use QSGFlatColorMaterial without including the header. Change-Id: I98c12d3c482f7cacb2f61dd13ae32ee0a5740ae2 Reviewed-by: Michael Brüning --- src/core/delegated_frame_node.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/delegated_frame_node.cpp b/src/core/delegated_frame_node.cpp index 9a64d2bb8..a4b2a4036 100644 --- a/src/core/delegated_frame_node.cpp +++ b/src/core/delegated_frame_node.cpp @@ -193,9 +193,9 @@ public: virtual void setupTiledContentNode(QSGTexture *, const QRect &, const QRectF &, QSGTexture::Filtering, QSGNode *) = 0; virtual void setupSolidColorNode(const QRect &, const QColor &, QSGNode *) = 0; - virtual void setupDebugBorderNode(QSGGeometry *, QSGFlatColorMaterial *, QSGNode *) = 0; #ifndef QT_NO_OPENGL + virtual void setupDebugBorderNode(QSGGeometry *, QSGFlatColorMaterial *, QSGNode *) = 0; virtual void setupYUVVideoNode(QSGTexture *, QSGTexture *, QSGTexture *, QSGTexture *, const QRectF &, const QRectF &, const QSizeF &, const QSizeF &, YUVVideoMaterial::ColorSpace, float, float, const QRectF &, @@ -274,7 +274,7 @@ public: if (rectangleNode->color() != color) rectangleNode->setColor(color); } - +#ifndef QT_NO_OPENGL void setupDebugBorderNode(QSGGeometry *geometry, QSGFlatColorMaterial *material, QSGNode *) override { @@ -283,7 +283,7 @@ public: geometryNode->setGeometry(geometry); geometryNode->setMaterial(material); } -#ifndef QT_NO_OPENGL + void setupYUVVideoNode(QSGTexture *, QSGTexture *, QSGTexture *, QSGTexture *, const QRectF &, const QRectF &, const QSizeF &, const QSizeF &, YUVVideoMaterial::ColorSpace, float, float, const QRectF &, @@ -377,6 +377,7 @@ public: m_sceneGraphNodes->append(rectangleNode); } +#ifndef QT_NO_OPENGL void setupDebugBorderNode(QSGGeometry *geometry, QSGFlatColorMaterial *material, QSGNode *layerChain) override { @@ -390,7 +391,6 @@ public: m_sceneGraphNodes->append(geometryNode); } -#ifndef QT_NO_OPENGL void setupYUVVideoNode(QSGTexture *yTexture, QSGTexture *uTexture, QSGTexture *vTexture, QSGTexture *aTexture, const QRectF &yaTexCoordRect, const QRectF &uvTexCoordRect, const QSizeF &yaTexSize, -- cgit v1.2.3