summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmlstate_p.h
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-06-26 04:52:07 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-06-26 04:52:07 (GMT)
commit3c45c081ce33f05ae200d252ebb5e9e1484bcc6d (patch)
tree5f8a6752e610ed8ca8bbf0ebd58cf16faad9b5e5 /src/declarative/util/qmlstate_p.h
parent0362832c16f95c2909e2a68351e15242b7d1b795 (diff)
downloadQt-3c45c081ce33f05ae200d252ebb5e9e1484bcc6d.zip
Qt-3c45c081ce33f05ae200d252ebb5e9e1484bcc6d.tar.gz
Qt-3c45c081ce33f05ae200d252ebb5e9e1484bcc6d.tar.bz2
Update SetProperties to handle changing bindings
Also removed all uses of SetProperty
Diffstat (limited to 'src/declarative/util/qmlstate_p.h')
-rw-r--r--src/declarative/util/qmlstate_p.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/declarative/util/qmlstate_p.h b/src/declarative/util/qmlstate_p.h
index 7fcbcd7..b4ec476 100644
--- a/src/declarative/util/qmlstate_p.h
+++ b/src/declarative/util/qmlstate_p.h
@@ -52,23 +52,21 @@ class SimpleAction
{
public:
enum State { StartState, EndState };
- SimpleAction(const Action &a, State state = StartState) : bv(0)
+ SimpleAction(const Action &a, State state = StartState)
{
property = a.property;
if (state == StartState) {
value = a.fromValue;
- binding = a.fromBinding;
+ binding = property.binding();
} else {
value = a.toValue;
binding = a.toBinding;
}
- bv = a.bv;
}
QmlMetaProperty property;
QVariant value;
- QString binding;
- QmlBindableValue *bv;
+ QmlBindableValue *binding;
};
class QmlStatePrivate : public QObjectPrivate