diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 2453ae970d..e53d86a134 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -757,20 +757,7 @@ void QStateMachinePrivate::applyProperties(const QList &tr } // Find the animations to use for the state change. - QList selectedAnimations; - if (animated) { - for (int i = 0; i < transitionList.size(); ++i) { - QAbstractTransition *transition = transitionList.at(i); - - selectedAnimations << transition->animations(); - selectedAnimations << defaultAnimationsForSource.values(transition->sourceState()); - - QList targetStates = transition->targetStates(); - for (int j=0; j selectedAnimations = selectAnimations(transitionList); // Initialize animations from property assignments. for (int i = 0; i < selectedAnimations.size(); ++i) { @@ -1153,6 +1140,25 @@ void QStateMachinePrivate::_q_animationFinished() } } +QList QStateMachinePrivate::selectAnimations(const QList &transitionList) const +{ + QList selectedAnimations; + if (animated) { + for (int i = 0; i < transitionList.size(); ++i) { + QAbstractTransition *transition = transitionList.at(i); + + selectedAnimations << transition->animations(); + selectedAnimations << defaultAnimationsForSource.values(transition->sourceState()); + + QList targetStates = transition->targetStates(); + for (int j=0; j defaultAnimationsForSource; QMultiHash defaultAnimationsForTarget; + QList selectAnimations(const QList &transitionList) const; #endif // QT_NO_ANIMATION QSignalEventGenerator *signalEventGenerator;