diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-16 15:27:16 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 13:14:52 +0200 |
| commit | 4241a5583623be758df3884c133acff2e11cd33f (patch) | |
| tree | cfc16898aca7238b3bf985e893db3fb7c7a85158 /tests/auto/qml/qqmlecmascript | |
| parent | 382709e14daeeb5132d6e39043b1140f251fc49b (diff) | |
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 <simon.hausmann@digia.com>
Diffstat (limited to 'tests/auto/qml/qqmlecmascript')
| -rw-r--r-- | tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<QQmlError> >("QList<QQmlError>"); QSignalSpy warningsSpy(&engine, SIGNAL(warnings(QList<QQmlError>))); |