aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph/coreapi
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@sletta.org>2015-01-05 13:21:45 +0100
committerGunnar Sletta <gunnar@sletta.org>2015-01-05 15:26:39 +0100
commitd8a09da9a49fa71bb127b5f0ba86e8f5e01c180c (patch)
tree1f0e80d74b39c97c9b081727454fe24ce5186192 /src/quick/scenegraph/coreapi
parent01cb25953d086e299b235a49853c7410c062e4c9 (diff)
Remove bogus assert.
It is perfectly valid to reparent nodes to a parent that is part of an existing hierarchy. Change-Id: Icf2dbe6030d399047e7ebe735e3096d1a8cd8c0e Task-number: QTBUG-43278 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src/quick/scenegraph/coreapi')
-rw-r--r--src/quick/scenegraph/coreapi/qsgnode.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgnode.cpp b/src/quick/scenegraph/coreapi/qsgnode.cpp
index bb22eee5d1..7f78318884 100644
--- a/src/quick/scenegraph/coreapi/qsgnode.cpp
+++ b/src/quick/scenegraph/coreapi/qsgnode.cpp
@@ -582,8 +582,6 @@ void QSGNode::removeAllChildNodes()
*/
void QSGNode::reparentChildNodesTo(QSGNode *newParent)
{
- Q_ASSERT_X(!newParent->parent(), "QSGNode::reparentChildNodesTo", "newParent is already part of a hierarchy");
-
for (QSGNode *c = firstChild(); c; c = firstChild()) {
removeChildNode(c);
newParent->appendChildNode(c);