diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-24 11:47:42 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-24 11:47:42 +0100 |
| commit | 4a4b5383e8e2a33db2b95b5540da430df0835125 (patch) | |
| tree | 6a1d3498b485657aba2dead6e2b9012ffe7fb8d2 /src/quick3d/quick3d/items | |
| parent | bc218e2fba92368e2c5d8547042d1939481d5e2c (diff) | |
| parent | 0eac16fbda846c951f9b3887199e72b66f5aacd7 (diff) | |
Merge remote-tracking branch 'origin/5.7.1' into 5.7
Change-Id: Idb141c715c7d06d2ecdce403d0f3740ee18b2b8f
Diffstat (limited to 'src/quick3d/quick3d/items')
| -rw-r--r-- | src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp index 90b6d681a..ce69e471a 100644 --- a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp +++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp @@ -148,7 +148,7 @@ void Quick3DNodeInstantiatorPrivate::_q_createdItem(int idx, QObject *item) Q_Q(Quick3DNodeInstantiator); if (m_objects.contains(item)) //Case when it was created synchronously in regenerate return; - static_cast<QNode *>(item)->setParent(q); + static_cast<QNode *>(item)->setParent(q->parentNode()); m_objects.insert(idx, item); if (m_objects.count() == 1) q->objectChanged(); |