diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-20 01:00:05 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-20 01:00:05 +0200 |
| commit | acbc9a3984a5c729c6731f73431aae6d802aa78a (patch) | |
| tree | 11580451e6478254d0c38a41f6670ea40c7a68a7 /src/quick/items/qquickitemviewfxitem.cpp | |
| parent | 8068e7b98cde09565efe27585b84e120f9c5ea99 (diff) | |
| parent | 4050d0eddd33c9a77d4ffe285e137280ec5dd5fe (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
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); |