diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-17 10:35:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-17 10:35:56 (GMT) |
| commit | f95d1dbd840c4959085ec44d24409ba134a05cd0 (patch) | |
| tree | 682ca16fbeeab618912f3718f1f9992d2c46e8bc /src/corelib/animation/qanimationgroup.cpp | |
| parent | 83e321747920c31d6fa4c860de3683630fbedb5d (diff) | |
| parent | 3a5f473a16b3bc64e6793a9a5002d961a2a0762a (diff) | |
| download | Qt-f95d1dbd840c4959085ec44d24409ba134a05cd0.zip Qt-f95d1dbd840c4959085ec44d24409ba134a05cd0.tar.gz Qt-f95d1dbd840c4959085ec44d24409ba134a05cd0.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix a crash in animation groups when deleting uncontrolled animations
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); |