diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-11-05 04:55:03 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-11-05 04:55:03 (GMT) |
| commit | e4e3b8f336b6c7d0dd52d4b8af96fee1dc628783 (patch) | |
| tree | 92190a3fa737205f95fb5655ec1222258c4471ae /src/declarative | |
| parent | f6caaf073408da5c85329fb4849e23f97621ea85 (diff) | |
| parent | b8ff76b37ee51585293dedb998b8f0b3c8b00e2f (diff) | |
| download | Qt-e4e3b8f336b6c7d0dd52d4b8af96fee1dc628783.zip Qt-e4e3b8f336b6c7d0dd52d4b8af96fee1dc628783.tar.gz Qt-e4e3b8f336b6c7d0dd52d4b8af96fee1dc628783.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/util/qmlpropertychanges.cpp | 2 |
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(); } |