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 /examples | |
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 'examples')
4 files changed, 0 insertions, 12 deletions
diff --git a/examples/qt3d/materials-cpp/renderableentity.cpp b/examples/qt3d/materials-cpp/renderableentity.cpp index 186a0b3e1..87474f6e1 100644 --- a/examples/qt3d/materials-cpp/renderableentity.cpp +++ b/examples/qt3d/materials-cpp/renderableentity.cpp @@ -59,11 +59,6 @@ RenderableEntity::RenderableEntity(Qt3DCore::QNode *parent) addComponent(m_transform); } -RenderableEntity::~RenderableEntity() -{ - QNode::cleanup(); -} - Qt3DRender::QMesh *RenderableEntity::mesh() const { return m_mesh; diff --git a/examples/qt3d/materials-cpp/renderableentity.h b/examples/qt3d/materials-cpp/renderableentity.h index 19ad81691..5ed767b54 100644 --- a/examples/qt3d/materials-cpp/renderableentity.h +++ b/examples/qt3d/materials-cpp/renderableentity.h @@ -59,7 +59,6 @@ class RenderableEntity : public Qt3DCore::QEntity { public: RenderableEntity(Qt3DCore::QNode *parent = 0); - ~RenderableEntity(); Qt3DRender::QMesh *mesh() const; Qt3DCore::QTransform *transform() const; diff --git a/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp b/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp index 4e9edc097..33e062971 100644 --- a/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp +++ b/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp @@ -101,9 +101,4 @@ TessellatedQuadMesh::TessellatedQuadMesh(Qt3DCore::QNode *parent) setGeometry(new TessellatedGeometry(this)); } -TessellatedQuadMesh::~TessellatedQuadMesh() -{ - QNode::cleanup(); -} - #include "tessellatedquadmesh.moc" diff --git a/examples/qt3d/tessellation-modes/tessellatedquadmesh.h b/examples/qt3d/tessellation-modes/tessellatedquadmesh.h index 2bf1bd31b..e60c54e86 100644 --- a/examples/qt3d/tessellation-modes/tessellatedquadmesh.h +++ b/examples/qt3d/tessellation-modes/tessellatedquadmesh.h @@ -58,7 +58,6 @@ class TessellatedQuadMesh : public Qt3DRender::QGeometryRenderer Q_OBJECT public: explicit TessellatedQuadMesh(Qt3DCore::QNode *parent = 0); - ~TessellatedQuadMesh(); }; #endif // TESSELLATEDQUAD_H |