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/qquickitemview.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/qquickitemview.cpp')
| -rw-r--r-- | src/quick/items/qquickitemview.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp index 431cb80a75..c20f778a8f 100644 --- a/src/quick/items/qquickitemview.cpp +++ b/src/quick/items/qquickitemview.cpp @@ -2232,7 +2232,10 @@ bool QQuickItemViewPrivate::prepareNonVisibleItemTransition(FxViewItem *item, co if (item->scheduledTransitionType() == QQuickItemViewTransitioner::MoveTransition) repositionItemAt(item, item->index, 0); - if (item->prepareTransition(transitioner, viewBounds)) { + bool success = false; + ACTION_IF_DELETED(item, success = item->prepareTransition(transitioner, viewBounds), return success); + + if (success) { item->releaseAfterTransition = true; return true; } |