diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-07 03:27:23 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-07 04:26:45 (GMT) |
| commit | b3beb6ded506f1701b68642d981c63295bc6c6a2 (patch) | |
| tree | 24eadcd6d3c1e1796ab142bd6b059f07f04f238c /src/declarative/qml | |
| parent | 60c9d955918dde759ac038ff73c7767d62add3b7 (diff) | |
| download | Qt-b3beb6ded506f1701b68642d981c63295bc6c6a2.zip Qt-b3beb6ded506f1701b68642d981c63295bc6c6a2.tar.gz Qt-b3beb6ded506f1701b68642d981c63295bc6c6a2.tar.bz2 | |
Disallow nested elements in ListModel
QTBUG-6082
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qdeclarativecustomparser.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativecustomparser.cpp b/src/declarative/qml/qdeclarativecustomparser.cpp index 8b6ee7c..1a97315 100644 --- a/src/declarative/qml/qdeclarativecustomparser.cpp +++ b/src/declarative/qml/qdeclarativecustomparser.cpp @@ -108,6 +108,9 @@ QDeclarativeCustomParserNodePrivate::fromObject(QDeclarativeParser::Object *root rootNode.d->properties << fromProperty(p); } + if (root->defaultProperty) + rootNode.d->properties << fromProperty(root->defaultProperty); + return rootNode; } |