aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/qdeclarativetransition_p.h
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2012-02-03 13:18:05 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-08 03:27:31 +0100
commitf5a43c09dbbf0caece4976303250a7582f6037ec (patch)
tree9cd519c671c792c708b186a92d18681deb31405e /src/quick/util/qdeclarativetransition_p.h
parent74ff1216a449d6098975b3c9baca7abb1399211b (diff)
Accept default targets for transitions
QDeclarativeAbstractAnimation::transition(), QDeclarativeTransition::prepare() and QDeclarativeTransitionManager now accept a QObject* to specify a default target for a transition. For view transitions, this will allow the view to pass a view item as the default target for a view transition so that the Transition does not have to explicitly set the target for every animation. Change-Id: I2c8d5535283335e139d98ef56f399f338627fb3e Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/quick/util/qdeclarativetransition_p.h')
-rw-r--r--src/quick/util/qdeclarativetransition_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/util/qdeclarativetransition_p.h b/src/quick/util/qdeclarativetransition_p.h
index 64fd45b725..839a626014 100644
--- a/src/quick/util/qdeclarativetransition_p.h
+++ b/src/quick/util/qdeclarativetransition_p.h
@@ -106,7 +106,8 @@ public:
QDeclarativeTransitionInstance *prepare(QDeclarativeStateOperation::ActionList &actions,
QList<QDeclarativeProperty> &after,
- QDeclarativeTransitionManager *end);
+ QDeclarativeTransitionManager *end,
+ QObject *defaultTarget);
void setReversed(bool r);