From d79234ed1874e7bc6a680e772d9f9c313a8097de Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 18 Jun 2013 14:15:19 +0200 Subject: [PATCH] Fix tst_qqmlecmascript::functionAssignmentfromJS_invalid Remove the column number from the expected output, as we generate those QQmlBinding objects from within a v4 callback and produce the line number and column number from the stack trace of the engine, which currently doesn't produce column numbers. Change-Id: I9840f0ab571d4261570dd079436aaa9f81e27abf Reviewed-by: Lars Knoll --- tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index 172d2b7..f910baa 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -5710,11 +5710,11 @@ void tst_qqmlecmascript::functionAssignmentfromJS_invalid() QVERIFY(!o->property("a").isValid()); QString url = component.url().toString(); - QString warning = url + ":67:17: Unable to assign QString to int"; + QString warning = url + ":67: Unable to assign QString to int"; QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData()); o->setProperty("assignWrongType", true); - warning = url + ":71:29: Unable to assign QString to int"; + warning = url + ":71: Unable to assign QString to int"; QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData()); o->setProperty("assignWrongTypeToValueType", true); -- 2.7.4