diff options
Diffstat (limited to 'src/quicktemplates2/qquickcontrol.cpp')
-rw-r--r-- | src/quicktemplates2/qquickcontrol.cpp | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index c039253d..a2b16a10 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -281,6 +281,27 @@ QQuickItem *QQuickControlPrivate::getContentItem() return contentItem; } +void QQuickControlPrivate::setContentItem_helper(QQuickItem *item, bool notify) +{ + Q_Q(QQuickControl); + if (contentItem == item) + return; + + q->contentItemChange(item, contentItem); + destroyDelegate(contentItem, q); + contentItem = item; + + if (item) { + if (!item->parentItem()) + item->setParentItem(q); + if (componentComplete) + resizeContent(); + } + + if (notify) + emit q->contentItemChanged(); +} + #if QT_CONFIG(accessibility) void QQuickControlPrivate::accessibilityActiveChanged(bool active) { @@ -1243,25 +1264,15 @@ void QQuickControl::setBackground(QQuickItem *background) QQuickItem *QQuickControl::contentItem() const { QQuickControlPrivate *d = const_cast<QQuickControlPrivate *>(d_func()); - return d->getContentItem(); + if (!d->contentItem) + d->setContentItem_helper(d->getContentItem(), false); + return d->contentItem; } void QQuickControl::setContentItem(QQuickItem *item) { Q_D(QQuickControl); - if (d->contentItem == item) - return; - - contentItemChange(item, d->contentItem); - QQuickControlPrivate::destroyDelegate(d->contentItem, this); - d->contentItem = item; - if (item) { - if (!item->parentItem()) - item->setParentItem(this); - if (isComponentComplete()) - d->resizeContent(); - } - emit contentItemChanged(); + d->setContentItem_helper(item, true); } void QQuickControl::classBegin() |