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_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_p.h')
| -rw-r--r-- | src/declarative/util/qmlanimation_p_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/util/qmlanimation_p_p.h b/src/declarative/util/qmlanimation_p_p.h index c66fa7a..e50415f 100644 --- a/src/declarative/util/qmlanimation_p_p.h +++ b/src/declarative/util/qmlanimation_p_p.h @@ -271,11 +271,12 @@ class QmlParentActionPrivate : public QmlAbstractAnimationPrivate Q_DECLARE_PUBLIC(QmlParentAction) public: QmlParentActionPrivate() - : QmlAbstractAnimationPrivate(), pcTarget(0), pcParent(0) {} + : QmlAbstractAnimationPrivate(), pcTarget(0), pcMatchTarget(0), pcParent(0) {} void init(); QmlGraphicsItem *pcTarget; + QmlGraphicsItem *pcMatchTarget; QmlGraphicsItem *pcParent; void doAction(); |