diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-06-09 15:26:58 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-06-11 19:27:56 +0000 |
| commit | 3fc58a37f50cbae3d3e551dc6311771b561175cd (patch) | |
| tree | f85094e6b55b450f2a2656427f07cf82f7b7d6a9 /tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp | |
| parent | 1d2818870034eacb1b0b6de3df279284d3ad24c3 (diff) | |
QNode parent changes
- introduce QNode::setParent(QNode *)
- QNode created with explicit parent now invoke
QNodePrivate::_q_addChild
- QNode::cleanup introduces, need to be added to the
dtor of every QT3D_CLONABLE QNode subclass. Handles
proper destruction.
- QNode::cleanup added to all classes that should have it.
- Updated unit tests of Nodes, Entity, Scene
Change-Id: Id2c2784122a78edaae5580fe5976d88be5a1921c
Task-number: QTBUG-45947
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp')
| -rw-r--r-- | tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp index 5dd229a50..d405358fd 100644 --- a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp +++ b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp @@ -528,7 +528,7 @@ void tst_QChangeArbiter::unregisterSceneObservers() QVERIFY(s->lastChange()->type() == Qt3D::NodeCreated); } - child->setParent(Q_NULLPTR); + child->setParent(Q_NODE_NULLPTR); arbiter->syncChanges(); Q_FOREACH (tst_SimpleObserver *o, observers) { |