summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-11-05 04:49:57 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-11-05 04:49:57 (GMT)
commitb8ff76b37ee51585293dedb998b8f0b3c8b00e2f (patch)
treeecfefa1965d112793a36305cb8a4a9e07b36502c /src
parent21ccecb582b251b9f7f3850b294868854ddac478 (diff)
parent656870157932a0b44de69927faa003c71eeb2a47 (diff)
downloadQt-b8ff76b37ee51585293dedb998b8f0b3c8b00e2f.zip
Qt-b8ff76b37ee51585293dedb998b8f0b3c8b00e2f.tar.gz
Qt-b8ff76b37ee51585293dedb998b8f0b3c8b00e2f.tar.bz2
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src')
-rw-r--r--src/declarative/util/qmlpropertychanges.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qmlpropertychanges.cpp b/src/declarative/util/qmlpropertychanges.cpp
index dbf2bc4..3cc6ca9 100644
--- a/src/declarative/util/qmlpropertychanges.cpp
+++ b/src/declarative/util/qmlpropertychanges.cpp
@@ -307,7 +307,7 @@ QmlPropertyChangesPrivate::property(const QByteArray &property)
if (!prop.isValid()) {
qmlInfo(QmlPropertyChanges::tr("Cannot assign to non-existant property \"%1\"").arg(QString::fromUtf8(property)), q);
return QmlMetaProperty();
- } else if (!prop.isWritable()) {
+ } else if (prop.type() != QmlMetaProperty::SignalProperty && !prop.isWritable()) {
qmlInfo(QmlPropertyChanges::tr("Cannot assign to read-only property \"%1\"").arg(QString::fromUtf8(property)), q);
return QmlMetaProperty();
}