diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-03-17 10:14:15 (GMT) |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-03-17 10:30:59 (GMT) |
commit | 3a5f473a16b3bc64e6793a9a5002d961a2a0762a (patch) | |
tree | c1becbb38ab0bc02e5eebfd18862e36e0f4d037c /src/corelib/animation/qanimationgroup.cpp | |
parent | 0ee7b05373d6d7097f3f8c9479c80f936921625e (diff) | |
download | Qt-3a5f473a16b3bc64e6793a9a5002d961a2a0762a.zip Qt-3a5f473a16b3bc64e6793a9a5002d961a2a0762a.tar.gz Qt-3a5f473a16b3bc64e6793a9a5002d961a2a0762a.tar.bz2 |
Fix a crash in animation groups when deleting uncontrolled animations
The problem was that we were not removing their references from the
private object hash and at some point we could access it.
Task-number: QTBUG-8910
Reviewed-by: gabi
Diffstat (limited to 'src/corelib/animation/qanimationgroup.cpp')
-rw-r--r-- | src/corelib/animation/qanimationgroup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/animation/qanimationgroup.cpp b/src/corelib/animation/qanimationgroup.cpp index a89f949..2decda3 100644 --- a/src/corelib/animation/qanimationgroup.cpp +++ b/src/corelib/animation/qanimationgroup.cpp @@ -244,7 +244,7 @@ QAbstractAnimation *QAnimationGroup::takeAnimation(int index) // in ChildRemoved event d->animations.removeAt(index); animation->setParent(0); - d->animationRemovedAt(index); + d->animationRemoved(index, animation); return animation; } @@ -285,7 +285,7 @@ bool QAnimationGroup::event(QEvent *event) } -void QAnimationGroupPrivate::animationRemovedAt(int index) +void QAnimationGroupPrivate::animationRemoved(int index, QAbstractAnimation *) { Q_Q(QAnimationGroup); Q_UNUSED(index); |