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/quick3d/quick3drender/items | |
| 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/quick3d/quick3drender/items')
| -rw-r--r-- | src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp | 5 | ||||
| -rw-r--r-- | src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp index 4ec789315..f9522f87d 100644 --- a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp +++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp @@ -61,11 +61,6 @@ Quick3DShaderDataArray::Quick3DShaderDataArray(QNode *parent) { } -Quick3DShaderDataArray::~Quick3DShaderDataArray() -{ - QNode::cleanup(); -} - QQmlListProperty<QShaderData> Quick3DShaderDataArray::valuesList() { return QQmlListProperty<QShaderData>(this, 0, diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h index 0269fd3fc..7f68e1456 100644 --- a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h +++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h @@ -76,7 +76,6 @@ class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DShaderDataArray : public Qt3DC public: explicit Quick3DShaderDataArray(Qt3DCore::QNode *parent = 0); - ~Quick3DShaderDataArray(); QQmlListProperty<QShaderData> valuesList(); QVector<QShaderData *> values() const; |