diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-19 13:05:12 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-19 13:05:12 +0200 |
| commit | a2d36c9ef566a3e0ec42e297a3d314f134c87da1 (patch) | |
| tree | 3cf02240bc190e0ae52c5cb1163e523635e443ab /src/quick/items/qquickitemviewfxitem.cpp | |
| parent | 15b90204fa5126f339db551cf7429534f1359322 (diff) | |
| parent | e9520ec84c95e10a6826b2289e46552a2d446895 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
src/imports/sharedimage/qsharedimageloader.cpp
src/quick/items/qquickitemviewfxitem_p_p.h
Change-Id: I12ce7c32788f4a394188a934e689b4ebac78138b
Diffstat (limited to 'src/quick/items/qquickitemviewfxitem.cpp')
| -rw-r--r-- | src/quick/items/qquickitemviewfxitem.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickitemviewfxitem.cpp b/src/quick/items/qquickitemviewfxitem.cpp index 60e9d7b115..ead4a030ac 100644 --- a/src/quick/items/qquickitemviewfxitem.cpp +++ b/src/quick/items/qquickitemviewfxitem.cpp @@ -56,6 +56,8 @@ QQuickItemViewFxItem::QQuickItemViewFxItem(QQuickItem *item, bool ownItem, QQuic QQuickItemViewFxItem::~QQuickItemViewFxItem() { delete transitionableItem; + transitionableItem = nullptr; + if (ownItem && item) { trackGeometry(false); item->setParentItem(0); |