diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-26 04:52:07 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-26 04:52:07 (GMT) |
| commit | 3c45c081ce33f05ae200d252ebb5e9e1484bcc6d (patch) | |
| tree | 5f8a6752e610ed8ca8bbf0ebd58cf16faad9b5e5 /src/declarative/util/qmlstateoperations.cpp | |
| parent | 0362832c16f95c2909e2a68351e15242b7d1b795 (diff) | |
| download | Qt-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/qmlstateoperations.cpp')
| -rw-r--r-- | src/declarative/util/qmlstateoperations.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp index 02b54f8..b7398a3 100644 --- a/src/declarative/util/qmlstateoperations.cpp +++ b/src/declarative/util/qmlstateoperations.cpp @@ -417,14 +417,8 @@ QmlSetProperty::ActionList QmlSetProperty::actions() a.property = prop; a.fromValue = cur; a.toValue = d->value; - if (!d->binding.isEmpty()) { - QmlBindableValue *bv = prop.binding(); - if (bv) { - a.fromBinding = bv->expression(); - a.bv = bv; - } - } - a.toBinding = d->binding; + if (!d->binding.isEmpty()) + a.toBinding = new QmlBindableValue(d->binding, object(), qmlContext(this)); return ActionList() << a; } |