diff options
Diffstat (limited to 'tests/auto')
7 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.2.errors.txt index 7a4f63bf0e..713d5f6272 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.2.errors.txt +++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.2.errors.txt @@ -1 +1 @@ -5:5:Duplicate property name +5:19:Duplicate property name diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.errors.txt index 18e07456ef..028e25c37f 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.errors.txt +++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.errors.txt @@ -1 +1 @@ -5:5:Duplicate method name +5:14:Duplicate method name diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.errors.txt index c83e5ae1e0..e9e27c479b 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.errors.txt +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.errors.txt @@ -1 +1 @@ -4:5:Illegal property name +4:18:Illegal property name diff --git a/tests/auto/declarative/qdeclarativelanguage/data/method.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/method.1.errors.txt index 0dab632ff6..98d0b9cefb 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/method.1.errors.txt +++ b/tests/auto/declarative/qdeclarativelanguage/data/method.1.errors.txt @@ -1 +1 @@ -4:5:Method names cannot begin with an upper case letter +4:14:Method names cannot begin with an upper case letter diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/property.6.errors.txt index 9e8d45448f..985c083cc3 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/property.6.errors.txt +++ b/tests/auto/declarative/qdeclarativelanguage/data/property.6.errors.txt @@ -1 +1 @@ -4:5:Property names cannot begin with an upper case letter +4:18:Property names cannot begin with an upper case letter diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.7.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/property.7.errors.txt index 9e8d45448f..985c083cc3 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/property.7.errors.txt +++ b/tests/auto/declarative/qdeclarativelanguage/data/property.7.errors.txt @@ -1 +1 @@ -4:5:Property names cannot begin with an upper case letter +4:18:Property names cannot begin with an upper case letter diff --git a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp index fa13e69685..6a03af503f 100644 --- a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp +++ b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp @@ -429,7 +429,7 @@ void tst_qdeclarativeqt::createQmlObject() QString warning1 = component.url().toString() + ":7: Error: Qt.createQmlObject(): Invalid arguments"; QString warning2 = component.url().toString()+ ":10: Error: Qt.createQmlObject(): failed to create object: \n " + testFileUrl("inline").toString() + ":2:10: Blah is not a type"; - QString warning3 = component.url().toString()+ ":11: Error: Qt.createQmlObject(): failed to create object: \n " + testFileUrl("main.qml").toString() + ":4:1: Duplicate property name"; + QString warning3 = component.url().toString()+ ":11: Error: Qt.createQmlObject(): failed to create object: \n " + testFileUrl("main.qml").toString() + ":4:14: Duplicate property name"; QString warning4 = component.url().toString()+ ":9: Error: Qt.createQmlObject(): Missing parent object"; QString warning5 = component.url().toString()+ ":8: Error: Qt.createQmlObject(): Invalid arguments"; QString warning6 = "RunTimeError: Qt.createQmlObject(): failed to create object: \n " + testFileUrl("inline").toString() + ":3: Cannot assign object type QObject with no default method"; |