diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-13 00:37:41 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-13 00:37:41 (GMT) |
| commit | e0a137cd1b138e63804756f897a20bf8178efb84 (patch) | |
| tree | af495868d66869eeac6e6dc5868d514539cfb2d7 /src/declarative/util/qmlanimation_p.h | |
| parent | abb70694334a770d4acb0ec607bb9b02defd1204 (diff) | |
| parent | 1e09535438b5dc7d2961b9bb22340a86a80f8856 (diff) | |
| download | Qt-e0a137cd1b138e63804756f897a20bf8178efb84.zip Qt-e0a137cd1b138e63804756f897a20bf8178efb84.tar.gz Qt-e0a137cd1b138e63804756f897a20bf8178efb84.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmlanimation_p.h')
| -rw-r--r-- | src/declarative/util/qmlanimation_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h index 0ed5082..f126dee 100644 --- a/src/declarative/util/qmlanimation_p.h +++ b/src/declarative/util/qmlanimation_p.h @@ -229,6 +229,7 @@ class QmlParentAction : public QmlAbstractAnimation Q_DECLARE_PRIVATE(QmlParentAction) Q_PROPERTY(QmlGraphicsItem *target READ object WRITE setObject) + Q_PROPERTY(QmlGraphicsItem *matchTarget READ matchTarget WRITE setMatchTarget) Q_PROPERTY(QmlGraphicsItem *parent READ parent WRITE setParent) public: @@ -238,6 +239,9 @@ public: QmlGraphicsItem *object() const; void setObject(QmlGraphicsItem *); + QmlGraphicsItem *matchTarget() const; + void setMatchTarget(QmlGraphicsItem *); + QmlGraphicsItem *parent() const; void setParent(QmlGraphicsItem *); |