diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-21 07:24:36 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-21 07:24:36 (GMT) |
| commit | 34055e0160e2e94b0dd6b972c5bdc96a421adcf1 (patch) | |
| tree | bf7667e86dfe4d5c8e7ee3be40aa8862ff4042ca /src/declarative/util/qmlstate_p.h | |
| parent | c301d995c646c70f8f943e2e4fc293a3e2d29edf (diff) | |
| parent | 8db694cb38e1f7f5096db96fcc1f168b13e643a4 (diff) | |
| download | Qt-34055e0160e2e94b0dd6b972c5bdc96a421adcf1.zip Qt-34055e0160e2e94b0dd6b972c5bdc96a421adcf1.tar.gz Qt-34055e0160e2e94b0dd6b972c5bdc96a421adcf1.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmlstate_p.h')
| -rw-r--r-- | src/declarative/util/qmlstate_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qmlstate_p.h b/src/declarative/util/qmlstate_p.h index 414ec08..73e2377 100644 --- a/src/declarative/util/qmlstate_p.h +++ b/src/declarative/util/qmlstate_p.h @@ -80,7 +80,7 @@ public: QmlMetaProperty property; QVariant value; - QmlBindableValue *binding; + QmlBinding *binding; QObject *specifiedObject; QString specifiedProperty; }; @@ -96,7 +96,7 @@ public: typedef QList<SimpleAction> SimpleActionList; QString name; - QmlBindableValue *when; + QmlBinding *when; QmlConcreteList<QmlStateOperation *> operations; QmlTransitionManager transitionManager; |