diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-18 16:38:38 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-18 16:38:38 (GMT) |
commit | 81a32769389052696fed414af3b6602c90fc4c89 (patch) | |
tree | b6718491fd4521a651eba6dbc31c82e3d1bfc737 /src/corelib/animation/qanimationgroup.cpp | |
parent | 6ac26093169e6ab89a868f8b71488ef29ecf3c3b (diff) | |
parent | 7a9d7a7ad225589d8815f91e07228a0beb74465b (diff) | |
download | Qt-81a32769389052696fed414af3b6602c90fc4c89.zip Qt-81a32769389052696fed414af3b6602c90fc4c89.tar.gz Qt-81a32769389052696fed414af3b6602c90fc4c89.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:
Stabilize taskQTBUG_7863_paintIntoCacheWithTransparentParts auto-test.
Optimize getting bearings of a glyph on Windows for true type fonts
Fixes blending problem when paiting non-opaque items with cache enabled.
Optimize speed of QTextLayout and QPainter::drawText
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); |