diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-04-21 11:06:50 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-04-21 11:06:50 (GMT) |
| commit | 1d150321ab0137b926ec226fcb868f3b38c36bfd (patch) | |
| tree | 85b60d9295ef49c3971aa7a7ec93ac0369e71c7f /src/corelib | |
| parent | 9ac25b0286f99e5c4d996a9e5b850cfe3eb8a5dd (diff) | |
| parent | a5248cd47a6d210c8faec20a8d962c88bbeb7846 (diff) | |
| download | Qt-1d150321ab0137b926ec226fcb868f3b38c36bfd.zip Qt-1d150321ab0137b926ec226fcb868f3b38c36bfd.tar.gz Qt-1d150321ab0137b926ec226fcb868f3b38c36bfd.tar.bz2 | |
Merge branch 'kinetic-animations' into kinetic-statemachine
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/animation/qanimationgroup.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/animation/qanimationgroup.cpp b/src/corelib/animation/qanimationgroup.cpp index f39738b..03573bb 100644 --- a/src/corelib/animation/qanimationgroup.cpp +++ b/src/corelib/animation/qanimationgroup.cpp @@ -164,9 +164,10 @@ void QAnimationGroup::insertAnimationAt(int index, QAbstractAnimation *animation return; } - d->animations.insert(index, animation); if (QAnimationGroup *oldGroup = animation->group()) oldGroup->removeAnimation(animation); + + d->animations.insert(index, animation); QAbstractAnimationPrivate::get(animation)->group = this; // this will make sure that ChildAdded event is sent to 'this' animation->setParent(this); |