diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-31 01:27:31 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-31 01:27:31 (GMT) |
commit | 3bc3ae40cf510c6d405a4bb37406db02e5a21386 (patch) | |
tree | 389cc0a9d7cc94128b7010ab783489795dd2820f /src/declarative/util/qmlpropertychanges.cpp | |
parent | 9dade8d2e57655019ed4dc2fcdc4e226401138a2 (diff) | |
download | Qt-3bc3ae40cf510c6d405a4bb37406db02e5a21386.zip Qt-3bc3ae40cf510c6d405a4bb37406db02e5a21386.tar.gz Qt-3bc3ae40cf510c6d405a4bb37406db02e5a21386.tar.bz2 |
Support overriding signal handlers in a state change.
Diffstat (limited to 'src/declarative/util/qmlpropertychanges.cpp')
-rw-r--r-- | src/declarative/util/qmlpropertychanges.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/declarative/util/qmlpropertychanges.cpp b/src/declarative/util/qmlpropertychanges.cpp index bece267..b5e204f 100644 --- a/src/declarative/util/qmlpropertychanges.cpp +++ b/src/declarative/util/qmlpropertychanges.cpp @@ -195,9 +195,14 @@ void QmlPropertyChangesPrivate::decode() ds >> data; if (isScript) { - QmlExpression *expression = new QmlExpression(qmlContext(q), data.toString(), object); - expression->setTrackChange(false); - expressions << qMakePair(name, expression); + QmlMetaProperty prop = property(name); //### can we avoid or reuse? + if (prop.type() != QmlMetaProperty::SignalProperty) { //binding + QmlExpression *expression = new QmlExpression(qmlContext(q), data.toString(), object); + expression->setTrackChange(false); + expressions << qMakePair(name, expression); + } else { + properties << qMakePair(name, data); //same as non-script + } } else { properties << qMakePair(name, data); } @@ -287,7 +292,7 @@ QmlPropertyChanges::ActionList QmlPropertyChanges::actions() if (a.property.propertyType() == QVariant::Url && (a.toValue.type() == QVariant::String || a.toValue.type() == QVariant::ByteArray) && !a.toValue.isNull()) - a.toValue.setValue(qmlContext(this)->resolvedUrl(QUrl(a.toValue.toString()))); //### d->object's context? + a.toValue.setValue(qmlContext(this)->resolvedUrl(QUrl(a.toValue.toString()))); list << a; } |