Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

2 files changed, 11 insertions, 6 deletions

diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index 1e8ce91..be02bcb 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -450,10 +450,10 @@ bool QmlMetaProperty::isWritable() const
 {
     if (propertyCategory() == List || propertyCategory() == QmlList)
         return true;
-    else if (!d->name.isEmpty() && d->object)
-        return d->object->metaObject()->property(d->coreIdx).isWritable();
     else if (type() & SignalProperty)
         return true;
+    else if (!d->name.isEmpty() && d->object)
+        return d->object->metaObject()->property(d->coreIdx).isWritable();
     else
         return false;
 }
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;
         }