diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-06-24 15:17:08 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-06-24 15:17:08 (GMT) |
| commit | 962d3938380dde01e2bd4915c51c95f47fafa0ec (patch) | |
| tree | 24524e62fa3c40930a0c6335bfab4d1276aa3f22 /src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp | |
| parent | f98829ae299e1f3c1f21b4bf2628601008e5141a (diff) | |
| parent | dab9d7c67ed2eda150c8da9e41db75f7eeeecd0d (diff) | |
| download | Qt-962d3938380dde01e2bd4915c51c95f47fafa0ec.zip Qt-962d3938380dde01e2bd4915c51c95f47fafa0ec.tar.gz Qt-962d3938380dde01e2bd4915c51c95f47fafa0ec.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp index b013957..85f92f2 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp @@ -282,7 +282,7 @@ JSValue JSC_HOST_CALL globalFuncEval(ExecState* exec, JSObject* function, JSValu UString s = x.toString(exec); - LiteralParser preparser(exec, s); + LiteralParser preparser(exec, s, LiteralParser::NonStrictJSON); if (JSValue parsedObject = preparser.tryLiteralParse()) return parsedObject; |