summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-09-16 08:56:48 +0200
committerLiang Qi <liang.qi@qt.io>2016-09-16 08:56:48 +0200
commitc2356328f88b044c8956fe7860c4c04fca4f2c30 (patch)
tree8c65f5c87903ce85a1ec9954a637de5e3bd1985d /src
parent5d4e7366718d3784063bdf64725a5371355f179a (diff)
parent59c6c0e0b1b5b46747595a58e11311b7393d7e70 (diff)
downloadqtquickcontrols-c2356328f88b044c8956fe7860c4c04fca4f2c30.tar.gz
Merge remote-tracking branch 'origin/5.6.2' into 5.6
Change-Id: I216e0df7ffff798827f4bea2c5cb8769eb37a053
Diffstat (limited to 'src')
-rw-r--r--src/layouts/qquicklayout.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/layouts/qquicklayout.cpp b/src/layouts/qquicklayout.cpp
index f28a7d07..a7e63195 100644
--- a/src/layouts/qquicklayout.cpp
+++ b/src/layouts/qquicklayout.cpp
@@ -695,6 +695,9 @@ QQuickLayout::QQuickLayout(QQuickLayoutPrivate &dd, QQuickItem *parent)
QQuickLayout::~QQuickLayout()
{
d_func()->m_isReady = false;
+
+ foreach (QQuickItem *child, d_func()->childItems)
+ QQuickItemPrivate::get(child)->removeItemChangeListener(this, QQuickItemPrivate::SiblingOrder);
}
QQuickLayoutAttached *QQuickLayout::qmlAttachedProperties(QObject *object)