aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/quick/util/qdeclarativesmoothedanimation.cpp5
-rw-r--r--src/quick/util/qdeclarativesmoothedanimation_p.h3
-rw-r--r--src/quick/util/qdeclarativespringanimation.cpp5
-rw-r--r--src/quick/util/qdeclarativespringanimation_p.h3
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();