From 4241a5583623be758df3884c133acff2e11cd33f Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 16 Sep 2013 15:27:16 +0200 Subject: Fix handling of empty Values Make things consistent between 32 and 64 bit again Adjust test results after the changes Almost all uses of Value::empty() will get removed in the future, but for now this gets all our tests to pass again. Change-Id: I44784a43432e78febbdfe78115c9be2a3e3ece76 Reviewed-by: Simon Hausmann --- tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/auto/qml/qqmlecmascript') diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index 086ffbae64..892e708aa4 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -6640,7 +6640,7 @@ void tst_qqmlecmascript::qtbug_22843() QQmlComponent component(&engine, testFileUrl(fileName)); QString url = component.url().toString(); QString warning1 = url.left(url.length()-3) + QLatin1String("js:4:16: Expected token `;'"); - QString warning2 = url + QLatin1String(":5: TypeError: Property 'func' of object NaN is not a function"); + QString warning2 = url + QLatin1String(":5: TypeError: Cannot call method 'func' of undefined"); qRegisterMetaType >("QList"); QSignalSpy warningsSpy(&engine, SIGNAL(warnings(QList))); -- cgit v1.2.3