aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2023-07-10 12:22:14 +0200
committerUlf Hermann <ulf.hermann@qt.io>2023-07-11 14:12:02 +0200
commit20f608651b32bc8a8a7c5dbf6a079666e9de446c (patch)
treed73c0b6e5e59f9106ea1d8b0e3e3184edaf44dba /src
parent4e69f2468ad599b7175f60e08341d37689512c9c (diff)
QQuickListView: Do not re-parent existing contexts
If we're not creating a new context, we should not re-parent it. Otherwise it gets deleted in unexpected moments. Amends commit 471c909a688df0bc56b6bc7773767a1ad5ecd85f. Pick-to: 6.5 6.6 Fixes: QTBUG-115106 Change-Id: Ib51d80dda07096587c64ac2262d115ea08855cd2 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/quick/items/qquicklistview.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index 9a4c8da89c..e196425965 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -1094,7 +1094,8 @@ QQuickItem * QQuickListViewPrivate::getSectionItem(const QString &section)
} else if (!reuseExistingContext) {
context->setContextProperty(QLatin1String("section"), section);
}
- QQml_setParent_noEvent(context, nobj);
+ if (!reuseExistingContext)
+ QQml_setParent_noEvent(context, nobj);
sectionItem = qobject_cast<QQuickItem *>(nobj);
if (!sectionItem) {
delete nobj;