aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/aggregation
diff options
context:
space:
mode:
authorDavid Schulz <david.schulz@qt.io>2023-11-28 15:36:43 +0100
committerDavid Schulz <david.schulz@qt.io>2023-11-29 05:20:19 +0000
commit48a77b5b09f9dcc8bb62f6f3df5d1c824ffbf10f (patch)
treebd63a97c343084d425ffd15e7bd956866c9624c9 /src/libs/aggregation
parenta35deb15323bc60a921e2787590670272baa5960 (diff)
Revert "Aggregation: Fix crash when components are in parent-child relationship"
This reverts commit 12428bf1d67bd282c5276383c91d968451b44036 because it triggers a qassert in QObject::setParent when the object is a widget. Change-Id: Ib9b76192f548cd3201fcb78a19ea88ccb5782ba2 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/libs/aggregation')
-rw-r--r--src/libs/aggregation/aggregate.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/libs/aggregation/aggregate.cpp b/src/libs/aggregation/aggregate.cpp
index 11d13907f3..7be6437ae2 100644
--- a/src/libs/aggregation/aggregate.cpp
+++ b/src/libs/aggregation/aggregate.cpp
@@ -193,9 +193,6 @@ void Aggregate::deleteSelf(QObject *obj)
QWriteLocker locker(&lock());
aggregateMap().remove(obj);
m_components.removeAll(obj);
- // Avoid issues if obj was child of another component of the aggregate.
- // The parent is deleted in ~Aggregate and might still have a reference on obj
- obj->setParent({});
}
delete this;
}