diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-17 02:58:35 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-17 02:58:35 (GMT) |
| commit | 1dcc60793f16e5922887a6fb2abff7d6fbe7146c (patch) | |
| tree | 0950e1f4c48d9d1b8d4d907816f4c33ed1e67cf9 /src/declarative/util | |
| parent | 20470e30d11733ada5443ff993d8518aa14737ca (diff) | |
| parent | 349df5c1ec50fde17a2dbf94af64ed76c55d7aaf (diff) | |
| download | Qt-1dcc60793f16e5922887a6fb2abff7d6fbe7146c.zip Qt-1dcc60793f16e5922887a6fb2abff7d6fbe7146c.tar.gz Qt-1dcc60793f16e5922887a6fb2abff7d6fbe7146c.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativepropertychanges.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp index 9c2b1e6..8865e04 100644 --- a/src/declarative/util/qdeclarativepropertychanges.cpp +++ b/src/declarative/util/qdeclarativepropertychanges.cpp @@ -439,7 +439,8 @@ QDeclarativePropertyChanges::ActionList QDeclarativePropertyChanges::actions() if (d->isExplicit) { a.toValue = d->expressions.at(ii).second->value(); } else { - QDeclarativeBinding *newBinding = new QDeclarativeBinding(d->expressions.at(ii).second->expression(), object(), qmlContext(this)); + QDeclarativeBinding *newBinding = + new QDeclarativeBinding(d->expressions.at(ii).second->expression(), object(), qmlContext(this)); newBinding->setTarget(prop); a.toBinding = newBinding; a.deletableToBinding = true; |