diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-25 16:54:09 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-26 09:19:59 +0000 |
commit | bcd1bed0b49e4ea8174bd323b6ad1f613abc0b13 (patch) | |
tree | 2a723988cf9eb2566490e4cf88f6a133c7ab3c07 /src/quicktemplates2/qquickpopuppositioner.cpp | |
parent | 31674ff67823f416497039a2fc029ccde113f055 (diff) |
QQuickPopupPositioner: use QQuickItem::isAncestorOf()
It was introduced in Qt 5.7, but wasn't taken into use yet...
Change-Id: Ib18f7e09a2de7bcd8fa51fd272cd555dc83103c9
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickpopuppositioner.cpp')
-rw-r--r-- | src/quicktemplates2/qquickpopuppositioner.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/quicktemplates2/qquickpopuppositioner.cpp b/src/quicktemplates2/qquickpopuppositioner.cpp index f9d12865..3f1e5d62 100644 --- a/src/quicktemplates2/qquickpopuppositioner.cpp +++ b/src/quicktemplates2/qquickpopuppositioner.cpp @@ -102,7 +102,7 @@ void QQuickPopupPositioner::itemParentChanged(QQuickItem *, QQuickItem *parent) void QQuickPopupPositioner::itemChildRemoved(QQuickItem *item, QQuickItem *child) { - if (isAncestor(child)) + if (child->isAncestorOf(m_parentItem)) removeAncestorListeners(item); } @@ -130,19 +130,4 @@ void QQuickPopupPositioner::addAncestorListeners(QQuickItem *item) } } -// TODO: use QQuickItem::isAncestorOf() in dev/5.7 -bool QQuickPopupPositioner::isAncestor(QQuickItem *item) const -{ - if (!m_parentItem) - return false; - - QQuickItem *parent = m_parentItem; - while (parent) { - if (parent == item) - return true; - parent = parent->parentItem(); - } - return false; -} - QT_END_NAMESPACE |