diff options
Diffstat (limited to 'src/quicktemplates2/qquickstackview_p.cpp')
-rw-r--r-- | src/quicktemplates2/qquickstackview_p.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/quicktemplates2/qquickstackview_p.cpp b/src/quicktemplates2/qquickstackview_p.cpp index 34301c2d..89b3c6e3 100644 --- a/src/quicktemplates2/qquickstackview_p.cpp +++ b/src/quicktemplates2/qquickstackview_p.cpp @@ -208,13 +208,13 @@ void QQuickStackViewPrivate::startTransition(const QQuickStackTransition &first, if (first.element) { if (immediate || !first.element->item || !first.element->prepareTransition(transitioner, first.viewBounds)) - completeTransition(first.element, transitioner->removeTransition, first.status); + completeTransition(first.element, first.transition, first.status); else first.element->startTransition(transitioner, first.status); } if (second.element) { if (immediate || !second.element->item || !second.element->prepareTransition(transitioner, second.viewBounds)) - completeTransition(second.element, transitioner->removeDisplacedTransition, second.status); + completeTransition(second.element, second.transition, second.status); else second.element->startTransition(transitioner, second.status); } @@ -249,14 +249,16 @@ void QQuickStackViewPrivate::viewItemTransitionFinished(QQuickItemViewTransition element->setStatus(QQuickStackView::Inactive); element->setVisible(false); if (element->removal || element->isPendingRemoval()) - removals += element; + removed += element; } if (transitioner->runningJobs.isEmpty()) { - qDeleteAll(removals); - removals.clear(); + qDeleteAll(removed); + removed.clear(); setBusy(false); } + + removing.remove(element); } void QQuickStackViewPrivate::setBusy(bool b) |