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

QmlDesigner: Fix crash when reparenting items into effected item

Browse Source 
Some effect related objects such as QQuickShaderEffectSource can be
silently removed alongside another object, so use QPointer to ensure
all objects are still valid before readding them.

Fixes: QDS-11973
Change-Id: I75ee2dc81e27774f8be87b031e149b135ec84023
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
This commit is contained in:
Miikka Heikkinen
2024-02-16 14:43:10 +02:00
parent d83a464615
commit 9d6d521643
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp
View File

@@ -291,7 +291,7 @@ static void removeObjectFromList(const QQmlProperty &property,
int count = listReference.count(); int count = listReference.count();
QObjectList objectList; QList<QPointer<QObject>> objectList;
for (int i = 0; i < count; i ++) { for (int i = 0; i < count; i ++) {
QObject *listItem = listReference.at(i); QObject *listItem = listReference.at(i);
@@ -301,8 +301,10 @@ static void removeObjectFromList(const QQmlProperty &property,
listReference.clear(); listReference.clear();
for (QObject *object : std::as_const(objectList)) for (QObject *object : std::as_const(objectList)) {
listReference.append(object); if (object)
listReference.append(object);
}
} }
void ObjectNodeInstance::removeFromOldProperty(QObject *object, QObject *oldParent, const PropertyName &oldParentProperty) void ObjectNodeInstance::removeFromOldProperty(QObject *object, QObject *oldParent, const PropertyName &oldParentProperty)