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 /tests/auto/core/nodes/tst_nodes.cpp | |
| 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 'tests/auto/core/nodes/tst_nodes.cpp')
| -rw-r--r-- | tests/auto/core/nodes/tst_nodes.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp index 973db6c0e..418625c31 100644 --- a/tests/auto/core/nodes/tst_nodes.cpp +++ b/tests/auto/core/nodes/tst_nodes.cpp @@ -169,7 +169,7 @@ public: ~MyQNode() { - QNode::cleanup(); + QMetaObject::invokeMethod(this, "_q_cleanup", Qt::DirectConnection); delete m_scene; } @@ -203,7 +203,7 @@ signals: void customPropertyChanged(); protected: - QT3D_CLONEABLE(MyQNode) + QT3D_CLONEABLE_CUSTOM_DTOR(MyQNode) QString m_customProperty; Qt3DCore::QScene *m_scene; @@ -216,11 +216,6 @@ public: explicit MyQComponent(Qt3DCore::QNode *parent = 0) : QComponent(parent) {} - ~MyQComponent() - { - QNode::cleanup(); - } - // QNode interface protected: QT3D_CLONEABLE(MyQComponent) |