diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-10-10 16:45:00 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-10-10 20:24:46 +0100 |
| commit | f82880c7b8cff8419873a936ced956d20ba88933 (patch) | |
| tree | b3802a20ca7c7abae4b53cbdf50b83d23dff733a /src/render/framegraph/framegraphnode_p.h | |
| parent | d2cc3828a1da686f07c9e748b80b20fc007e37fe (diff) | |
| parent | 0826c7fbdfbc34280376ba165931f3a30c3d1e50 (diff) | |
Merge branch '5.7' into 5.8
Conflicts:
tests/auto/input/input.pro
Change-Id: I591202f144aeec915e18611dfce358d4f15faff6
Diffstat (limited to 'src/render/framegraph/framegraphnode_p.h')
| -rw-r--r-- | src/render/framegraph/framegraphnode_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h index c6e58823b..a29fb8070 100644 --- a/src/render/framegraph/framegraphnode_p.h +++ b/src/render/framegraph/framegraphnode_p.h @@ -107,6 +107,8 @@ public: FrameGraphNode *parent() const; QVector<FrameGraphNode *> children() const; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + protected: FrameGraphNode(FrameGraphNodeType nodeType, QBackendNode::Mode mode = QBackendNode::ReadOnly); void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_OVERRIDE; |