Merge branch 'dev' into wip/animationwip/animation

Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f

1 files changed, 4 insertions, 10 deletions

diff --git a/src/render/framegraph/framegraphvisitor_p.h b/src/render/framegraph/framegraphvisitor_p.h
index af8f4caab..f4c0d7796 100644
--- a/src/render/framegraph/framegraphvisitor_p.h
+++ b/src/render/framegraph/framegraphvisitor_p.h
@@ -66,24 +66,18 @@ class FrameGraphNode;
 class Renderer;
 class FrameGraphManager;
 
-class FrameGraphVisitor
+class Q_AUTOTEST_EXPORT FrameGraphVisitor
 {
 public:
-    explicit FrameGraphVisitor(Renderer *renderer,
-                               const FrameGraphManager *nodeManager);
+    explicit FrameGraphVisitor(const FrameGraphManager *nodeManager);
 
-    void traverse(FrameGraphNode *root,
-                  QVector<Qt3DCore::QAspectJobPtr> *jobs);
-
-    inline int leafNodeCount() Q_DECL_NOTHROW { return m_renderviewIndex; }
+    QVector<FrameGraphNode *> traverse(FrameGraphNode *root);
 
 private:
     void visit(Render::FrameGraphNode *node);
 
-    Renderer *m_renderer;
     const FrameGraphManager *m_manager;
-    QVector<Qt3DCore::QAspectJobPtr> *m_jobs;
-    int m_renderviewIndex;
+    QVector<FrameGraphNode *> m_leaves;
 };
 
 } // namespace Render