diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-12 15:23:26 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-04-23 11:14:34 +0000 |
commit | 6d508fa954a2d90e90dff5a2e509aecd13b18f8f (patch) | |
tree | 32c788c4c637d6c9660706fc652f6515da3b4559 /src/logic | |
parent | 0542f1614aa6d50c4c9809fb0ce5f1adb5666d67 (diff) |
QNode: make cleanup a private slot
QT3D_CLONEABLE now implements a default dtor that calls _q_ cleanup
QT3D_CLONEABLE_CUSTOM_DTOR is used for classes that really need to implement
their own dtor but they need to invoke _q_cleanup manually
Change-Id: I2937a3b9edeb5a763749f0044360d78ab4461a5e
Task-number: QTBUG-51464
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/logic')
-rw-r--r-- | src/logic/qframeaction.cpp | 5 | ||||
-rw-r--r-- | src/logic/qframeaction.h | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/logic/qframeaction.cpp b/src/logic/qframeaction.cpp index bc7094205..4ff540e21 100644 --- a/src/logic/qframeaction.cpp +++ b/src/logic/qframeaction.cpp @@ -89,11 +89,6 @@ QFrameAction::QFrameAction(QFrameActionPrivate &dd, QNode *parent) { } -QFrameAction::~QFrameAction() -{ - QNode::cleanup(); -} - /*! \internal This function will be called in a synchronous manner once each frame by diff --git a/src/logic/qframeaction.h b/src/logic/qframeaction.h index 7a869a5f6..9000c916e 100644 --- a/src/logic/qframeaction.h +++ b/src/logic/qframeaction.h @@ -60,7 +60,6 @@ class QT3DLOGICSHARED_EXPORT QFrameAction : public Qt3DCore::QComponent public: explicit QFrameAction(Qt3DCore::QNode *parent = nullptr); - ~QFrameAction(); protected: QFrameAction(QFrameActionPrivate &dd, QNode *parent = nullptr); |