From a6bcd2624533ed00ce5cc1dd50ffbb042be5cb93 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 23 Jun 2015 15:58:31 +0200 Subject: TabBar: ensure correct destruction order to avoid crashes in tst_tabbar Change-Id: I20f6536fbd1eb4afdabf016bdac611a9ee190f84 Reviewed-by: J-P Nurmi --- src/controls/qquicktabbar.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/controls/qquicktabbar.cpp b/src/controls/qquicktabbar.cpp index 7e240726..b3fd3593 100644 --- a/src/controls/qquicktabbar.cpp +++ b/src/controls/qquicktabbar.cpp @@ -227,12 +227,16 @@ QQuickTabBar::QQuickTabBar(QQuickItem *parent) : QQuickTabBar::~QQuickTabBar() { Q_D(QQuickTabBar); + delete d->contentItem; const int count = d->contentModel->count(); for (int i = 0; i < count; ++i) { QQuickItem *item = itemAt(i); - if (item) + if (item) { QQuickItemPrivate::get(item)->removeItemChangeListener(d, QQuickItemPrivate::Destroyed | QQuickItemPrivate::Parent); + delete item; + } } + delete d->contentModel; } /*! -- cgit v1.2.3