feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/6.0'

Browse Source 
Change-Id: I655155b35747082ac891a4b95e1680871d9b3234
This commit is contained in:
Eike Ziller
2021-10-08 16:00:32 +02:00
parent 9cb0bd94f0 7bb21fcfff
commit 2ae0d4d0b1
179 changed files with 3173 additions and 1098 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
+3
View File
@@ -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);