aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquicktableview.cpp
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2020-03-10 09:43:44 +0200
committerKari Oikarinen <kari.oikarinen@qt.io>2020-03-10 09:43:44 +0200
commitb67264a2644b22dc23f6a06ff48974c77cb45d84 (patch)
tree3ac6547ac4daecac92feb4d192ed0cf97f5b758a /src/quick/items/qquicktableview.cpp
parentdf034c07be4828778d43a4037f89f31ac26f411d (diff)
parent92daa739ec114a0c9ae841db0459b0eff1f86cef (diff)
Merge 5.14 into 5.14.2
Diffstat (limited to 'src/quick/items/qquicktableview.cpp')
-rw-r--r--src/quick/items/qquicktableview.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp
index 4b34e3b2c1..4105996b31 100644
--- a/src/quick/items/qquicktableview.cpp
+++ b/src/quick/items/qquicktableview.cpp
@@ -441,7 +441,16 @@ QQuickTableViewPrivate::QQuickTableViewPrivate()
QQuickTableViewPrivate::~QQuickTableViewPrivate()
{
- releaseLoadedItems(QQmlTableInstanceModel::NotReusable);
+ for (auto *fxTableItem : loadedItems) {
+ if (auto item = fxTableItem->item) {
+ if (fxTableItem->ownItem)
+ delete item;
+ else if (tableModel)
+ tableModel->dispose(item);
+ }
+ delete fxTableItem;
+ }
+
if (tableModel)
delete tableModel;
}