QWindowsVistaStyle: Do not stop animations when falling back to XP.

Otherwise, progress bar animations are stopped.

Task-number: QTBUG-46308
Change-Id: I7b6a2b26afb885db6bc9aea719a002f0ebe7274d
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2015-05-26 12:08:17 +02:00
parent a8dda3b8b0
commit fe6eeab561

View File

@ -250,8 +250,6 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt
int state = option->state; int state = option->state;
if (!QWindowsVistaStylePrivate::useVista()) { if (!QWindowsVistaStylePrivate::useVista()) {
foreach (const QObject *target, d->animationTargets())
d->stopAnimation(target);
QWindowsStyle::drawPrimitive(element, option, painter, widget); QWindowsStyle::drawPrimitive(element, option, painter, widget);
return; return;
} }
@ -810,8 +808,6 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
QWindowsVistaStylePrivate *d = const_cast<QWindowsVistaStylePrivate*>(d_func()); QWindowsVistaStylePrivate *d = const_cast<QWindowsVistaStylePrivate*>(d_func());
if (!QWindowsVistaStylePrivate::useVista()) { if (!QWindowsVistaStylePrivate::useVista()) {
foreach (const QObject *target, d->animationTargets())
d->stopAnimation(target);
QWindowsStyle::drawControl(element, option, painter, widget); QWindowsStyle::drawControl(element, option, painter, widget);
return; return;
} }
@ -1494,8 +1490,6 @@ void QWindowsVistaStyle::drawComplexControl(ComplexControl control, const QStyle
{ {
QWindowsVistaStylePrivate *d = const_cast<QWindowsVistaStylePrivate*>(d_func()); QWindowsVistaStylePrivate *d = const_cast<QWindowsVistaStylePrivate*>(d_func());
if (!QWindowsVistaStylePrivate::useVista()) { if (!QWindowsVistaStylePrivate::useVista()) {
foreach (const QObject *target, d->animationTargets())
d->stopAnimation(target);
QWindowsStyle::drawComplexControl(control, option, painter, widget); QWindowsStyle::drawComplexControl(control, option, painter, widget);
return; return;
} }