summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJüri Valdmann <juri.valdmann@qt.io>2017-04-25 12:42:27 +0200
committerJüri Valdmann <juri.valdmann@qt.io>2017-04-26 13:59:21 +0000
commit3b24c024f2606cd93b1f397338f349582003c2ce (patch)
tree5c7a89cc1f0a710547216223f3e3eb12d88faf7e
parent3902b27ee40400db6cf596ca0db31b6497f0421b (diff)
Fix undeclared use of QSGFlatColorMaterial when QT_NO_OPENGL is defined
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 <michael.bruning@qt.io>
-rw-r--r--src/core/delegated_frame_node.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/delegated_frame_node.cpp b/src/core/delegated_frame_node.cpp
index 9a64d2bb..a4b2a403 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,