diff options
| author | Jan Arve Sæther <jan-arve.saether@qt.io> | 2022-06-01 14:38:01 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-08 13:22:01 +0000 |
| commit | 38775d58beb93ef2e4810f7efdca08a070faebc0 (patch) | |
| tree | f9f145abfb05101013d0ac50a4e32bf5c19b32e4 | |
| parent | 13a617610ac7d372316683b3160a2ce6c3eb7af4 (diff) | |
Remove all usage of m_ignoredItems
It's not used anymore in the base class, so its existence is currently
pointless
Change-Id: I7838ae9a570b3167a14558422fd6938fb4dac200
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit abc85505933a64cbceedd8e6fbc60288ac56fc1a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/quicklayouts/qquicklayout_p.h | 1 | ||||
| -rw-r--r-- | src/quicklayouts/qquickstacklayout.cpp | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/quicklayouts/qquicklayout_p.h b/src/quicklayouts/qquicklayout_p.h index 03f760c51e..921be97f44 100644 --- a/src/quicklayouts/qquicklayout_p.h +++ b/src/quicklayouts/qquicklayout_p.h @@ -173,7 +173,6 @@ protected: unsigned m_isReady : 1; unsigned m_disableRearrange : 1; unsigned m_hasItemChangeListeners : 1; // if false, we don't need to remove its item change listeners... - mutable QSet<QQuickItem *> m_ignoredItems; }; diff --git a/src/quicklayouts/qquickstacklayout.cpp b/src/quicklayouts/qquickstacklayout.cpp index 434f387b3d..436b049486 100644 --- a/src/quicklayouts/qquickstacklayout.cpp +++ b/src/quicklayouts/qquickstacklayout.cpp @@ -313,7 +313,6 @@ void QQuickStackLayout::invalidate(QQuickItem *childItem) void QQuickStackLayout::updateLayoutItems() { Q_D(QQuickStackLayout); - d->m_ignoredItems.clear(); const int count = itemCount(); int oldIndex = d->currentIndex; if (!d->explicitCurrentIndex) @@ -384,10 +383,7 @@ void QQuickStackLayout::collectItemSizeHints(QQuickItem *item, QSizeF *sizeHints bool QQuickStackLayout::shouldIgnoreItem(QQuickItem *item) const { - const bool ignored = QQuickItemPrivate::get(item)->isTransparentForPositioner(); - if (ignored) - d_func()->m_ignoredItems << item; - return ignored; + return QQuickItemPrivate::get(item)->isTransparentForPositioner(); } QQuickStackLayoutAttached::QQuickStackLayoutAttached(QObject *object) |