summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativelanguage/data/component.3.errors.txt
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-03-02 02:10:00 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-03-02 02:10:00 (GMT)
commit6fca750adba0205da7b8d96df83c9d26ad1e1d3d (patch)
tree89fbc9ecc14009ce2f21fe05b2b6bd9a1ec50997 /tests/auto/declarative/qdeclarativelanguage/data/component.3.errors.txt
parented13b84dc515e6d0971bd455dd38dad11a7aed95 (diff)
parent2de0a9ff40c6dcbfca5dc75aae7ac0a294618f4a (diff)
downloadQt-6fca750adba0205da7b8d96df83c9d26ad1e1d3d.zip
Qt-6fca750adba0205da7b8d96df83c9d26ad1e1d3d.tar.gz
Qt-6fca750adba0205da7b8d96df83c9d26ad1e1d3d.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/data/component.3.errors.txt')
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/component.3.errors.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.3.errors.txt
index 9a13142..450fc16 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/component.3.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.3.errors.txt
@@ -1 +1 @@
-6:9:Invalid component id specification
+6:9:Property value set multiple times