diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2012-02-10 11:36:37 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-10 05:19:20 +0100 |
commit | a7f4e2d208c945dc2ddf4102cb00943498405e7d (patch) | |
tree | 709f34c8d339280dccd27aecbbe2dca22cf8d893 | |
parent | eb447afb375e122c3be1c56affbf944f8687f1b6 (diff) |
Update SmoothedAnimation and SpringAnimation to accept default target.
Followup to f5a43c09dbbf0caece4976303250a7582f6037ec.
Change-Id: I591836996b815f3128b5f67f11efcc644011d6b4
Reviewed-by: Bea Lam <bea.lam@nokia.com>
-rw-r--r-- | src/quick/util/qdeclarativesmoothedanimation.cpp | 5 | ||||
-rw-r--r-- | src/quick/util/qdeclarativesmoothedanimation_p.h | 3 | ||||
-rw-r--r-- | src/quick/util/qdeclarativespringanimation.cpp | 5 | ||||
-rw-r--r-- | src/quick/util/qdeclarativespringanimation_p.h | 3 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/quick/util/qdeclarativesmoothedanimation.cpp b/src/quick/util/qdeclarativesmoothedanimation.cpp index 9b61561fef..4f2ed7dbe3 100644 --- a/src/quick/util/qdeclarativesmoothedanimation.cpp +++ b/src/quick/util/qdeclarativesmoothedanimation.cpp @@ -391,12 +391,13 @@ void QDeclarativeSmoothedAnimationPrivate::updateRunningAnimations() QAbstractAnimationJob* QDeclarativeSmoothedAnimation::transition(QDeclarativeStateActions &actions, QDeclarativeProperties &modified, - TransitionDirection direction) + TransitionDirection direction, + QObject *defaultTarget) { Q_UNUSED(direction); Q_D(QDeclarativeSmoothedAnimation); - QDeclarativeStateActions dataActions = QDeclarativePropertyAnimation::createTransitionActions(actions, modified); + QDeclarativeStateActions dataActions = QDeclarativePropertyAnimation::createTransitionActions(actions, modified, defaultTarget); QParallelAnimationGroupJob *wrapperGroup = new QParallelAnimationGroupJob(); diff --git a/src/quick/util/qdeclarativesmoothedanimation_p.h b/src/quick/util/qdeclarativesmoothedanimation_p.h index d065a20516..9a0bc22216 100644 --- a/src/quick/util/qdeclarativesmoothedanimation_p.h +++ b/src/quick/util/qdeclarativesmoothedanimation_p.h @@ -83,7 +83,8 @@ public: virtual QAbstractAnimationJob* transition(QDeclarativeStateActions &actions, QDeclarativeProperties &modified, - TransitionDirection direction); + TransitionDirection direction, + QObject *defaultTarget = 0); Q_SIGNALS: void velocityChanged(); void reversingModeChanged(); diff --git a/src/quick/util/qdeclarativespringanimation.cpp b/src/quick/util/qdeclarativespringanimation.cpp index 40408bb112..3cc5f4dbc3 100644 --- a/src/quick/util/qdeclarativespringanimation.cpp +++ b/src/quick/util/qdeclarativespringanimation.cpp @@ -526,14 +526,15 @@ void QDeclarativeSpringAnimation::setMass(qreal mass) QAbstractAnimationJob* QDeclarativeSpringAnimation::transition(QDeclarativeStateActions &actions, QDeclarativeProperties &modified, - TransitionDirection direction) + TransitionDirection direction, + QObject *defaultTarget) { Q_D(QDeclarativeSpringAnimation); Q_UNUSED(direction); QParallelAnimationGroupJob *wrapperGroup = new QParallelAnimationGroupJob(); - QDeclarativeStateActions dataActions = QDeclarativeNumberAnimation::createTransitionActions(actions, modified); + QDeclarativeStateActions dataActions = QDeclarativeNumberAnimation::createTransitionActions(actions, modified, defaultTarget); if (!dataActions.isEmpty()) { QSet<QAbstractAnimationJob*> anims; for (int i = 0; i < dataActions.size(); ++i) { diff --git a/src/quick/util/qdeclarativespringanimation_p.h b/src/quick/util/qdeclarativespringanimation_p.h index 21515d087b..2f28700208 100644 --- a/src/quick/util/qdeclarativespringanimation_p.h +++ b/src/quick/util/qdeclarativespringanimation_p.h @@ -89,7 +89,8 @@ public: virtual QAbstractAnimationJob* transition(QDeclarativeStateActions &actions, QDeclarativeProperties &modified, - TransitionDirection direction); + TransitionDirection direction, + QObject *defaultTarget = 0); Q_SIGNALS: void modulusChanged(); |