From 8f5366aed675ce7928448be2f6d739d0548b350e Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Mon, 13 Mar 2017 12:33:49 +0100
Subject: Build for for -no-feature-quick-sprite

Change-Id: Iaf26d9cec7f9fa7a5d6d24c729b2dc92737cca1f
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
---
 src/plugins/scenegraph/openvg/openvg.pro               | 7 +++++--
 src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp     | 5 ++++-
 src/plugins/scenegraph/openvg/qsgopenvgcontext_p.h     | 2 ++
 src/plugins/scenegraph/openvg/qsgopenvgnodevisitor.cpp | 4 ++++
 src/plugins/scenegraph/openvg/qsgopenvgnodevisitor.h   | 2 ++
 src/plugins/scenegraph/openvg/qsgopenvgspritenode.h    | 2 ++
 6 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/plugins/scenegraph/openvg/openvg.pro b/src/plugins/scenegraph/openvg/openvg.pro
index 6d5b190b37..43c2636343 100644
--- a/src/plugins/scenegraph/openvg/openvg.pro
+++ b/src/plugins/scenegraph/openvg/openvg.pro
@@ -31,7 +31,6 @@ HEADERS += \
     qsgopenvghelpers.h \
     qsgopenvgfontglyphcache.h \
     qsgopenvgpainternode.h \
-    qsgopenvgspritenode.h \
     qsgopenvgrenderable.h \
     qopenvgoffscreensurface.h
 
@@ -52,6 +51,10 @@ SOURCES += \
     qsgopenvghelpers.cpp \
     qsgopenvgfontglyphcache.cpp \
     qsgopenvgpainternode.cpp \
-    qsgopenvgspritenode.cpp \
     qsgopenvgrenderable.cpp \
     qopenvgoffscreensurface.cpp
+
+qtConfig(quick-sprite) {
+    HEADERS += qsgopenvgspritenode.h
+    SOURCES += qsgopenvgspritenode.cpp
+}
diff --git a/src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp b/src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp
index 41fce7c7fc..76ebb7c4ee 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp
+++ b/src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp
@@ -45,7 +45,9 @@
 #include "qsgopenvgglyphnode_p.h"
 #include "qsgopenvgfontglyphcache.h"
 #include "qsgopenvgpainternode.h"
+#if QT_CONFIG(quick_sprite)
 #include "qsgopenvgspritenode.h"
+#endif
 
 #include "qopenvgcontext_p.h"
 
@@ -171,11 +173,12 @@ int QSGOpenVGRenderContext::maxTextureSize() const
     return qMin(width, height);
 }
 
-
+#if QT_CONFIG(quick_sprite)
 QSGSpriteNode *QSGOpenVGContext::createSpriteNode()
 {
     return new QSGOpenVGSpriteNode();
 }
+#endif
 
 QSGRendererInterface *QSGOpenVGContext::rendererInterface(QSGRenderContext *renderContext)
 {
diff --git a/src/plugins/scenegraph/openvg/qsgopenvgcontext_p.h b/src/plugins/scenegraph/openvg/qsgopenvgcontext_p.h
index fa9939a253..31a1e8643f 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvgcontext_p.h
+++ b/src/plugins/scenegraph/openvg/qsgopenvgcontext_p.h
@@ -95,7 +95,9 @@ public:
     QSurfaceFormat defaultSurfaceFormat() const override;
     QSGInternalRectangleNode *createInternalRectangleNode() override;
     QSGInternalImageNode *createInternalImageNode() override;
+#if QT_CONFIG(quick_sprite)
     QSGSpriteNode *createSpriteNode() override;
+#endif
     QSGRendererInterface *rendererInterface(QSGRenderContext *renderContext) override;
 };
 
diff --git a/src/plugins/scenegraph/openvg/qsgopenvgnodevisitor.cpp b/src/plugins/scenegraph/openvg/qsgopenvgnodevisitor.cpp
index 8aa179f705..41606c653a 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvgnodevisitor.cpp
+++ b/src/plugins/scenegraph/openvg/qsgopenvgnodevisitor.cpp
@@ -43,7 +43,9 @@
 #include "qsgopenvgpublicnodes.h"
 #include "qsgopenvgglyphnode_p.h"
 #include "qsgopenvgpainternode.h"
+#if QT_CONFIG(quick_sprite)
 #include "qsgopenvgspritenode.h"
+#endif
 #include "qsgopenvgrenderable.h"
 
 #include "qopenvgcontext_p.h"
@@ -209,6 +211,7 @@ void QSGOpenVGNodeVisitor::endVisit(QSGRootNode *)
 {
 }
 
+#if QT_CONFIG(quick_sprite)
 bool QSGOpenVGNodeVisitor::visit(QSGSpriteNode *node)
 {
     renderRenderableNode(static_cast<QSGOpenVGSpriteNode*>(node));
@@ -218,6 +221,7 @@ bool QSGOpenVGNodeVisitor::visit(QSGSpriteNode *node)
 void QSGOpenVGNodeVisitor::endVisit(QSGSpriteNode *)
 {
 }
+#endif
 
 bool QSGOpenVGNodeVisitor::visit(QSGRenderNode *)
 {
diff --git a/src/plugins/scenegraph/openvg/qsgopenvgnodevisitor.h b/src/plugins/scenegraph/openvg/qsgopenvgnodevisitor.h
index 4805d63024..c6461ca67d 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvgnodevisitor.h
+++ b/src/plugins/scenegraph/openvg/qsgopenvgnodevisitor.h
@@ -73,8 +73,10 @@ public:
     void endVisit(QSGGlyphNode *) override;
     bool visit(QSGRootNode *) override;
     void endVisit(QSGRootNode *) override;
+#if QT_CONFIG(quick_sprite)
     bool visit(QSGSpriteNode *) override;
     void endVisit(QSGSpriteNode *) override;
+#endif
     bool visit(QSGRenderNode *) override;
     void endVisit(QSGRenderNode *) override;
 
diff --git a/src/plugins/scenegraph/openvg/qsgopenvgspritenode.h b/src/plugins/scenegraph/openvg/qsgopenvgspritenode.h
index 3ade2ef8ad..d47b389a0b 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvgspritenode.h
+++ b/src/plugins/scenegraph/openvg/qsgopenvgspritenode.h
@@ -43,6 +43,8 @@
 #include <private/qsgadaptationlayer_p.h>
 #include "qsgopenvgrenderable.h"
 
+QT_REQUIRE_CONFIG(quick_sprite);
+
 QT_BEGIN_NAMESPACE
 class QSGOpenVGTexture;
 class QSGOpenVGSpriteNode : public QSGSpriteNode, public QSGOpenVGRenderable
-- 
cgit v1.2.3