summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmlstate.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.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.h')
-rw-r--r--src/declarative/util/qmlstate.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/declarative/util/qmlstate.h b/src/declarative/util/qmlstate.h
index 59ef812..e9a173c 100644
--- a/src/declarative/util/qmlstate.h
+++ b/src/declarative/util/qmlstate.h
@@ -60,15 +60,18 @@ class Action
public:
Action();
+ bool restore:1;
+ bool actionDone:1;
+
QmlMetaProperty property;
- bool restore;
QVariant fromValue;
QVariant toValue;
- QString fromBinding;
- QString toBinding;
- QmlBindableValue *bv;
+
+ QmlBindableValue *fromBinding;
+ QmlBindableValue *toBinding;
ActionEvent *event;
- bool actionDone;
+
+ void deleteFromBinding();
};
class ActionEvent