From 14b41264a1c3770e98d2ff075ba8bbe6cda2f841 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 7 Jan 2016 13:35:30 +0100 Subject: ApplicationWindow: don't delete old headers and footers Change-Id: I6df97edff6f034d79cbd95828a17d5f48dbf1d46 Task-number: QTBUG-50332 Reviewed-by: Mitch Curtis --- src/templates/qquickapplicationwindow.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/templates/qquickapplicationwindow.cpp b/src/templates/qquickapplicationwindow.cpp index 46f07d3e..3e6734d7 100644 --- a/src/templates/qquickapplicationwindow.cpp +++ b/src/templates/qquickapplicationwindow.cpp @@ -240,7 +240,8 @@ void QQuickApplicationWindow::setHeader(QQuickItem *header) { Q_D(QQuickApplicationWindow); if (d->header != header) { - delete d->header; + if (d->header) + QQuickItemPrivate::get(d->header)->removeItemChangeListener(d, QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); d->header = header; if (header) { header->setParentItem(contentItem()); @@ -273,7 +274,8 @@ void QQuickApplicationWindow::setFooter(QQuickItem *footer) { Q_D(QQuickApplicationWindow); if (d->footer != footer) { - delete d->footer; + if (d->footer) + QQuickItemPrivate::get(d->footer)->removeItemChangeListener(d, QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); d->footer = footer; if (footer) { footer->setParentItem(contentItem()); -- cgit v1.2.3