diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-18 13:07:22 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-09-21 11:16:28 +0200 |
| commit | 02b4770c3d867bf0b562db63015a7137479db10a (patch) | |
| tree | 57157d0101a295fd394bf9acc91dd216fb361264 /src/imports/layouts | |
| parent | 858c62583ff776edb8c9e539f0331f5d658de2d1 (diff) | |
| parent | 345226aa3ecee8642c3bf46e40c981d4a49d958e (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/qml/qml/qqmltypeloader.cpp
Change-Id: I07647700fc86764c95a5ef95c568e700a70fe45f
Diffstat (limited to 'src/imports/layouts')
| -rw-r--r-- | src/imports/layouts/qquicklayout.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/imports/layouts/qquicklayout.cpp b/src/imports/layouts/qquicklayout.cpp index 98e2aea44f..07ada75a5f 100644 --- a/src/imports/layouts/qquicklayout.cpp +++ b/src/imports/layouts/qquicklayout.cpp @@ -698,6 +698,10 @@ QQuickLayout::QQuickLayout(QQuickLayoutPrivate &dd, QQuickItem *parent) QQuickLayout::~QQuickLayout() { d_func()->m_isReady = false; + + const auto childItems = d_func()->childItems; + for (QQuickItem *child : childItems) + QQuickItemPrivate::get(child)->removeItemChangeListener(this, QQuickItemPrivate::SiblingOrder); } QQuickLayoutAttached *QQuickLayout::qmlAttachedProperties(QObject *object) |