diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2019-10-23 14:51:44 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2019-10-24 11:52:50 +0200 |
| commit | e10e956ab9264782230f31c2424eeb10cd91568d (patch) | |
| tree | fe2294aa8ec1765d4f67280843793ec36bd206d6 | |
| parent | 0cf71c4f5ac5c17b879ef7dd54c00ea51a90f39e (diff) | |
QQuickContainer: stop creating duplicate content items
In most cases, getContentItem() will create a new content item when
called. In addition, its only responsibility is to return the content
item, not set it as the control's new contentItem;
QQuickControl::contentItem() does that.
Instead, QQuickContainer should simply call contentItem().
Change-Id: I1b8cb57f9f7b9e56074e99bed20ce5bcac70e1a6
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
| -rw-r--r-- | src/quicktemplates2/qquickcontainer.cpp | 2 | ||||
| -rw-r--r-- | src/quicktemplates2/qquicksplitview.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp index 609c2079..47aaa1e2 100644 --- a/src/quicktemplates2/qquickcontainer.cpp +++ b/src/quicktemplates2/qquickcontainer.cpp @@ -241,7 +241,7 @@ void QQuickContainerPrivate::insertItem(int index, QQuickItem *item) updatingCurrent = true; - item->setParentItem(effectiveContentItem(getContentItem())); + item->setParentItem(effectiveContentItem(q->contentItem())); QQuickItemPrivate::get(item)->addItemChangeListener(this, changeTypes); contentModel->insert(index, item); diff --git a/src/quicktemplates2/qquicksplitview.cpp b/src/quicktemplates2/qquicksplitview.cpp index b131aa25..56392e9a 100644 --- a/src/quicktemplates2/qquicksplitview.cpp +++ b/src/quicktemplates2/qquicksplitview.cpp @@ -930,7 +930,6 @@ QQuickItem *QQuickSplitViewPrivate::getContentItem() if (QQuickItem *item = QQuickContainerPrivate::getContentItem()) return item; - // TODO: why are several created? return new QQuickContentItem(q); } |