diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-10-08 01:29:20 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-10-08 01:29:20 (GMT) |
| commit | e72192e778a6670bd1384a4e5ab7012ac1525f1a (patch) | |
| tree | 238f1bc17085475585003862cebf74334bd65718 /src | |
| parent | a5b0d58bbba508d708b2711124c61a74e3b4f310 (diff) | |
| parent | 8480eb288990c44c9ab337f42898bc4ef6dc62f4 (diff) | |
| download | Qt-e72192e778a6670bd1384a4e5ab7012ac1525f1a.zip Qt-e72192e778a6670bd1384a4e5ab7012ac1525f1a.tar.gz Qt-e72192e778a6670bd1384a4e5ab7012ac1525f1a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index dc28e22..7a29f24 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -1932,6 +1932,9 @@ bool QDeclarativeCompiler::buildPropertyAssignment(QDeclarativeParser::Property { obj->addValueProperty(prop); + if (prop->values.count() > 1) + COMPILE_EXCEPTION(prop->values.at(0), tr( "Cannot assign multiple values to a singular property") ); + for (int ii = 0; ii < prop->values.count(); ++ii) { Value *v = prop->values.at(ii); if (v->object) { |