summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativelanguage/data/script.8.errors.txt
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-03-02 02:08:54 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-03-02 02:08:54 (GMT)
commitb3c94b923200dd9c98b66f4233c62e63a3ee79d4 (patch)
tree4181b0f4e3feb993d9eeae16c0dd1ccf5daa5bc3 /tests/auto/declarative/qdeclarativelanguage/data/script.8.errors.txt
parent8da93faace82eb2bc86e76c0ad0a0c5c95e3b8bf (diff)
parenta9d327db7e77cc167172ad3199b6ffbc1c9da74f (diff)
downloadQt-b3c94b923200dd9c98b66f4233c62e63a3ee79d4.zip
Qt-b3c94b923200dd9c98b66f4233c62e63a3ee79d4.tar.gz
Qt-b3c94b923200dd9c98b66f4233c62e63a3ee79d4.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/data/script.8.errors.txt')
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/script.8.errors.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.8.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.8.errors.txt
index b5bf1a8..450fc16 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/script.8.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.8.errors.txt
@@ -1 +1 @@
-6:9:Invalid Script source value
+6:9:Property value set multiple times