diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-05-28 17:59:34 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-05-28 17:59:40 +0200 |
| commit | 0f5c34f2c6b64bae3429706a6c4211334c689092 (patch) | |
| tree | b85888d73518f6abc7bbde74ab71a27887682f9d /src/quick/util/qquickstategroup.cpp | |
| parent | 44ca7e31ee9365a72cd17ecd335ec4d0161420a9 (diff) | |
| parent | 9d61684d70c8691d81536b7b519388586e2cbbb8 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Ie7dbc5a7d9eccd1613283134a1b47ab597d036d5
Diffstat (limited to 'src/quick/util/qquickstategroup.cpp')
| -rw-r--r-- | src/quick/util/qquickstategroup.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/util/qquickstategroup.cpp b/src/quick/util/qquickstategroup.cpp index d8daec2f07..b53949d21c 100644 --- a/src/quick/util/qquickstategroup.cpp +++ b/src/quick/util/qquickstategroup.cpp @@ -130,6 +130,8 @@ QQuickStateGroup::~QQuickStateGroup() Q_D(const QQuickStateGroup); for (int i = 0; i < d->states.count(); ++i) d->states.at(i)->setStateGroup(nullptr); + if (d->nullState) + d->nullState->setStateGroup(nullptr); } QList<QQuickState *> QQuickStateGroup::states() const |