aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorChris Adams <christopher.adams@nokia.com>2011-08-03 14:00:57 +1000
committerQt by Nokia <qt-info@nokia.com>2011-08-04 06:07:22 +0200
commit7964b819aefbee380ca24288c6234f5917211529 (patch)
tree55c7623db9d2038faa68136ac54c4503d5c25c33 /tests
parentfd68b868aee89f40138492468745f0e5edb3286e (diff)
Improve error messages from compiler for signals and slots
This commit ensures that correct line and column information is provided in some cases (duplicate signal or method name, etc). Task-number: QTBUG-15076 Change-Id: I483bdc92ef4f1d1d2ff565bb957385fd495672da Reviewed-on: http://codereview.qt.nokia.com/1619 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.errors.txt2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.errors.txt2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/method.1.errors.txt2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/signal.4.errors.txt2
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.errors.txt
index c5860a2f4b..8226c16a1e 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.errors.txt
@@ -1 +1 @@
-3:1:Duplicate signal name
+5:12:Duplicate signal name
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.errors.txt
index b293c862b1..18e07456ef 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.errors.txt
@@ -1 +1 @@
-3:1:Duplicate method name
+5:5:Duplicate method name
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/method.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/method.1.errors.txt
index b10984f035..0dab632ff6 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/method.1.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/method.1.errors.txt
@@ -1 +1 @@
-3:1:Method names cannot begin with an upper case letter
+4:5:Method names cannot begin with an upper case letter
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/signal.4.errors.txt
index d96f9e3ed9..513ff60ae6 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/signal.4.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.4.errors.txt
@@ -1 +1 @@
-3:1:Signal names cannot begin with an upper case letter
+4:12:Signal names cannot begin with an upper case letter