diff -r 56cd8111b7f7 -r 41300fa6a67c src/gui/widgets/qwidgetanimator.cpp --- a/src/gui/widgets/qwidgetanimator.cpp Tue Jan 26 12:42:25 2010 +0200 +++ b/src/gui/widgets/qwidgetanimator.cpp Tue Feb 02 00:43:10 2010 +0200 @@ -88,8 +88,6 @@ const QRect final_geometry = _final_geometry.isValid() || widget->isWindow() ? _final_geometry : QRect(QPoint(-500 - widget->width(), -500 - widget->height()), widget->size()); - if (r == final_geometry) - return; //the widget is already where it should be #ifndef QT_NO_ANIMATION AnimationMap::const_iterator it = m_animation_map.constFind(widget); if (it != m_animation_map.constEnd() && (*it)->endValue().toRect() == final_geometry) @@ -105,7 +103,9 @@ #else //we do it in one shot widget->setGeometry(final_geometry); +#ifndef QT_NO_MAINWINDOW m_mainWindowLayout->animationFinished(widget); +#endif //QT_NO_MAINWINDOW #endif //QT_NO_ANIMATION } @@ -114,9 +114,4 @@ return !m_animation_map.isEmpty(); } -bool QWidgetAnimator::animating(QWidget *widget) const -{ - return m_animation_map.contains(widget); -} - QT_END_NAMESPACE