diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-05-09 08:42:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-09 09:09:28 +0000 |
| commit | c5ff1f7f159b4dfa0fc2803df9866eab18339eaa (patch) | |
| tree | 414037b99d63dbcc405db046594e900076ef4c2e /src/render/framegraph/framegraphnode_p.h | |
| parent | 5679b23c5338ae41d12755cf4e26a95bc391d0a9 (diff) | |
| parent | e9642824244fa9fe55dca2cef8e002192a4f1b17 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/render/backend/abstractrenderer_p.h
src/render/renderers/opengl/renderer/renderer.cpp
tests/auto/render/renderer/tst_renderer.cpp
Change-Id: Ib6da858f10bec57bdb1002bd8fa4172304d118f2
Diffstat (limited to 'src/render/framegraph/framegraphnode_p.h')
| -rw-r--r-- | src/render/framegraph/framegraphnode_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h index 5bd9b1b12..420abce56 100644 --- a/src/render/framegraph/framegraphnode_p.h +++ b/src/render/framegraph/framegraphnode_p.h @@ -112,8 +112,6 @@ public: FrameGraphManager *manager() const; void setParentId(Qt3DCore::QNodeId parentId); - void appendChildId(Qt3DCore::QNodeId childHandle); - void removeChildId(Qt3DCore::QNodeId childHandle); Qt3DCore::QNodeId parentId() const; QVector<Qt3DCore::QNodeId> childrenIds() const; @@ -121,6 +119,8 @@ public: FrameGraphNode *parent() const; QVector<FrameGraphNode *> children() const; + void cleanup(); + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override; protected: |