diff options
Diffstat (limited to 'src/quicktemplates2/qquickapplicationwindow.cpp')
-rw-r--r-- | src/quicktemplates2/qquickapplicationwindow.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index 0123786a..dcf1b5f0 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -138,14 +138,15 @@ class QQuickApplicationWindowPrivate : public QQuickItemChangeListener public: QQuickApplicationWindowPrivate() - : complete(false) - , background(nullptr) - , contentItem(nullptr) - , header(nullptr) - , footer(nullptr) - , overlay(nullptr) - , activeFocusControl(nullptr) - { } + : complete(false), + background(nullptr), + contentItem(nullptr), + header(nullptr), + footer(nullptr), + overlay(nullptr), + activeFocusControl(nullptr) + { + } static QQuickApplicationWindowPrivate *get(QQuickApplicationWindow *window) { @@ -283,8 +284,8 @@ void QQuickApplicationWindowPrivate::setActiveFocusControl(QQuickItem *control) } } -QQuickApplicationWindow::QQuickApplicationWindow(QWindow *parent) : - QQuickWindowQmlImpl(parent), d_ptr(new QQuickApplicationWindowPrivate) +QQuickApplicationWindow::QQuickApplicationWindow(QWindow *parent) + : QQuickWindowQmlImpl(parent), d_ptr(new QQuickApplicationWindowPrivate) { d_ptr->q_ptr = this; connect(this, SIGNAL(activeFocusItemChanged()), this, SLOT(_q_updateActiveFocus())); @@ -334,7 +335,7 @@ void QQuickApplicationWindow::setBackground(QQuickItem *background) if (d->background == background) return; - delete d->background; + QQuickControlPrivate::destroyDelegate(d->background, this); d->background = background; if (background) { background->setParentItem(QQuickWindow::contentItem()); |