diff options
author | Mike Krus <mike.krus@kdab.com> | 2020-02-26 12:16:46 +0000 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2020-02-27 14:19:19 +0000 |
commit | 2e97cde1dd6f0dec7ee36df8d02527b955597e07 (patch) | |
tree | 8a8668228a0b0b0cb15d3c288caef0c05deab387 /src/animation | |
parent | 5bf4f93fcb8ff16aeadf55644be351c9989ab5b2 (diff) |
Add QBackendNode::syncFromFrontEnd to public API
Removes need to per aspect overrides of
QAbstractAspectPrivate::syncDirtyFrontEndNode which was required
in Qt5 to preserve BC.
Change-Id: Ib3b05af1c3ded1c985d35e4dec0fe203cdc907cb
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/animation')
-rw-r--r-- | src/animation/backend/backendnode_p.h | 2 | ||||
-rw-r--r-- | src/animation/frontend/qanimationaspect.cpp | 6 | ||||
-rw-r--r-- | src/animation/frontend/qanimationaspect_p.h | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/src/animation/backend/backendnode_p.h b/src/animation/backend/backendnode_p.h index b7bbff844..9f850c2c6 100644 --- a/src/animation/backend/backendnode_p.h +++ b/src/animation/backend/backendnode_p.h @@ -69,7 +69,7 @@ public: void setHandler(Handler *handler); - virtual void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime); + void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override; protected: void setDirty(Handler::DirtyFlag flag); diff --git a/src/animation/frontend/qanimationaspect.cpp b/src/animation/frontend/qanimationaspect.cpp index b44ceaef4..a25eb533e 100644 --- a/src/animation/frontend/qanimationaspect.cpp +++ b/src/animation/frontend/qanimationaspect.cpp @@ -69,12 +69,6 @@ QAnimationAspectPrivate::QAnimationAspectPrivate() { } -void QAnimationAspectPrivate::syncDirtyFrontEndNode(QNode *node, QBackendNode *backend, bool firstTime) const -{ - Animation::BackendNode *renderBackend = static_cast<Animation::BackendNode *>(backend); - renderBackend->syncFromFrontEnd(node, firstTime); -} - /*! \class Qt3DAnimation::QAnimationAspect \inherits Qt3DCore::QAbstractAspect diff --git a/src/animation/frontend/qanimationaspect_p.h b/src/animation/frontend/qanimationaspect_p.h index 203acd386..2ecc8fdb8 100644 --- a/src/animation/frontend/qanimationaspect_p.h +++ b/src/animation/frontend/qanimationaspect_p.h @@ -70,8 +70,6 @@ public: Q_DECLARE_PUBLIC(QAnimationAspect) - void syncDirtyFrontEndNode(Qt3DCore::QNode *node, Qt3DCore::QBackendNode *backend, bool firstTime) const override; - QScopedPointer<Animation::Handler> m_handler; }; |