diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-12 13:54:41 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-12 13:55:47 +0100 |
commit | 3bd5304827359c32e50f84c75436521c440bba86 (patch) | |
tree | fb570cfabaa581a6446def56169281cb6beb9a43 /src/templates | |
parent | 4c7a8894562de4d69ea439cc62a02502a2d27be0 (diff) | |
parent | a3dddf0471452448003cfe6c6802e3ccaf565b5d (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I62205e6f9636270cbc0a39b8c5e2cd61c605f39f
Diffstat (limited to 'src/templates')
-rw-r--r-- | src/templates/qquickapplicationwindow.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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()); |