diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-10-08 16:00:32 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-10-08 16:00:32 +0200 |
| commit | 2ae0d4d0b1548d2d1ab61582a946cf3766856ca5 (patch) | |
| tree | 98f0a7678810a5d06056743b9b965ae69a4f9b68 /share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp | |
| parent | 9cb0bd94f0473077269078cc0da34d5e1fb600a0 (diff) | |
| parent | 7bb21fcfff2b0fe6c6248ff85cdafae452ef7c8c (diff) | |
Merge remote-tracking branch 'origin/6.0'
Change-Id: I655155b35747082ac891a4b95e1680871d9b3234
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp index 2046a2039e..1dae931af3 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp @@ -779,6 +779,9 @@ void QuickItemNodeInstance::reparent(const ObjectNodeInstance::Pointer &oldParen ObjectNodeInstance::reparent(oldParentInstance, oldParentProperty, newParentInstance, newParentProperty); + if (!newParentInstance) + quickItem()->setParentItem(nullptr); + if (instanceIsValidLayoutable(newParentInstance, newParentProperty)) { setInLayoutable(true); setMovable(false); |