summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.errors.txt
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-02-25 14:53:09 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-02-25 14:53:09 (GMT)
commit8d720825279c8bf06d28b1f756031402f117002b (patch)
tree5ea180f93387223c532d76f53d74054ea7a6f2b4 /tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.errors.txt
parent8928e37c8b1b375e74c5981915c034123de11b3d (diff)
parentd6197028818e51e78249b029a823fde1b0ffde03 (diff)
downloadQt-8d720825279c8bf06d28b1f756031402f117002b.zip
Qt-8d720825279c8bf06d28b1f756031402f117002b.tar.gz
Qt-8d720825279c8bf06d28b1f756031402f117002b.tar.bz2
Merge branch 'master' of git:qt/qt-qml
Conflicts: src/declarative/graphicsitems/qdeclarativeparticles.cpp
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.errors.txt')
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.errors.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.errors.txt
new file mode 100644
index 0000000..69c6871
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.errors.txt
@@ -0,0 +1 @@
+4:5:Cannot assign to non-existent property "foo"