diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2009-06-26 02:20:09 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2009-06-26 02:20:09 (GMT) |
| commit | 1e9b20cb6603b61f8d07a9f1da927dbf94f8525a (patch) | |
| tree | 95a2a56849806d12acc75c8902c1ee54a46ba871 /src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp | |
| parent | e32bc79d9ab52e5b70e3cd27bddb2bec9c81f5a5 (diff) | |
| parent | db24e82b6b74be303492f186a45d784fcd84fdc6 (diff) | |
| download | Qt-1e9b20cb6603b61f8d07a9f1da927dbf94f8525a.zip Qt-1e9b20cb6603b61f8d07a9f1da927dbf94f8525a.tar.gz Qt-1e9b20cb6603b61f8d07a9f1da927dbf94f8525a.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; |