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

Merge remote-tracking branch 'origin/8.0' into 9.0

Browse Source 
Conflicts:
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/qmldesigner/designercore/imagecache/meshimagecachecollector.cpp

Change-Id: I38f196e8f42cf11f7b613e7a723745600e35c5e9
This commit is contained in:
Eike Ziller
2022-09-27 10:03:37 +02:00
parent 21c5d3499b 4da6686705
commit 7eaa36e6e5
61 changed files with 932 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.cpp
View File

@@ -94,5 +94,21 @@ bool QmlStateNodeInstance::resetStateProperty(const ObjectNodeInstance::Pointer
return QmlPrivateGate::States::resetStateProperty(object(), target->object(), propertyName, resetValue);
}
void QmlStateNodeInstance::reparent(const ObjectNodeInstance::Pointer &oldParentInstance,
const PropertyName &oldParentProperty,
const ObjectNodeInstance::Pointer &newParentInstance,
const PropertyName &newParentProperty)
{
ServerNodeInstance oldState = nodeInstanceServer()->activeStateInstance();
ObjectNodeInstance::reparent(oldParentInstance,
oldParentProperty,
newParentInstance,
newParentProperty);
if (oldState.isValid())
oldState.activateState();
}
} // namespace Internal
} // namespace QmlDesigner