diff options
author | Liang Qi <liang.qi@qt.io> | 2017-06-26 09:23:11 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-06-26 09:23:50 +0000 |
commit | 4beee1a6dcc1be57aa6fb2a175dadc6ff298545d (patch) | |
tree | b6973a72fa88ef2a0aa5e31ed4cdfaa9164258d5 /src/imports/shapes/qquickshapegenericrenderer_p.h | |
parent | 21fd17d7c1fca77e802ba2d3fd5aeebcdef157e4 (diff) |
shapes: Convert QT_NO_OPENGL to QT_CONFIG(opengl)
Also guard fillGradient for now.
Task-number: QTBUG-61632
Change-Id: I5fa2607cc1ede0922519258afd455bee4d0187c7
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/imports/shapes/qquickshapegenericrenderer_p.h')
-rw-r--r-- | src/imports/shapes/qquickshapegenericrenderer_p.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/imports/shapes/qquickshapegenericrenderer_p.h b/src/imports/shapes/qquickshapegenericrenderer_p.h index ad2427f00a..1f36e3decf 100644 --- a/src/imports/shapes/qquickshapegenericrenderer_p.h +++ b/src/imports/shapes/qquickshapegenericrenderer_p.h @@ -133,7 +133,9 @@ private: Qt::FillRule fillRule; QPainterPath path; bool fillGradientActive; +#if QT_CONFIG(opengl) QQuickShapeGradientCache::GradientDesc fillGradient; +#endif VertexContainerType fillVertices; IndexContainerType fillIndices; QSGGeometry::Type indexType; @@ -218,7 +220,9 @@ public: QQuickWindow *window() const { return m_window; } // shadow data for custom materials +#if QT_CONFIG(opengl) QQuickShapeGradientCache::GradientDesc m_fillGradient; +#endif private: QSGGeometry *m_geometry; @@ -245,7 +249,7 @@ public: static QSGMaterial *createLinearGradient(QQuickWindow *window, QQuickShapeGenericStrokeFillNode *node); }; -#ifndef QT_NO_OPENGL +#if QT_CONFIG(opengl) class QQuickShapeLinearGradientShader : public QSGMaterialShader { @@ -297,7 +301,7 @@ private: QQuickShapeGenericStrokeFillNode *m_node; }; -#endif // QT_NO_OPENGL +#endif // QT_CONFIG(opengl) QT_END_NAMESPACE |