summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2020-06-30 17:18:26 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-07-01 03:37:39 +0000
commitcca3a77e7b7cf514e245233ae4f647a0ceba12d2 (patch)
treeaa5b47b47575b2aad0a43fc6698bb6a9fe91157d
parent85986c36a75e6f547fef96341299725f29d504e1 (diff)
Animation Handler: assign iterator on erase
Change-Id: Ia65be6befec3aa07080650ad82c59053b6d3670b Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 809ef32b3901213dcd0576a77eb507a06ba55ff3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/animation/backend/handler.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/animation/backend/handler.cpp b/src/animation/backend/handler.cpp
index 95363d56f..f87e0a2a2 100644
--- a/src/animation/backend/handler.cpp
+++ b/src/animation/backend/handler.cpp
@@ -147,7 +147,7 @@ void Handler::cleanupHandleList(QVector<HAnimationClip> *clips)
{
for (auto it = clips->begin(); it != clips->end(); ) {
if (!m_animationClipLoaderManager->data(*it))
- clips->erase(it);
+ it = clips->erase(it);
else
++it;
}
@@ -157,7 +157,7 @@ void Handler::cleanupHandleList(QVector<HClipAnimator> *animators)
{
for (auto it = animators->begin(); it != animators->end(); ) {
if (!m_clipAnimatorManager->data(*it))
- animators->erase(it);
+ it = animators->erase(it);
else
++it;
}
@@ -167,7 +167,7 @@ void Handler::cleanupHandleList(QVector<HBlendedClipAnimator> *animators)
{
for (auto it = animators->begin(); it != animators->end(); ) {
if (!m_blendedClipAnimatorManager->data(*it))
- animators->erase(it);
+ it = animators->erase(it);
else
++it;
}