diff options
| author | Tobias Koenig <tokoe@kde.org> | 2009-07-05 08:47:45 (GMT) |
|---|---|---|
| committer | Tobias Koenig <tokoe@kde.org> | 2009-07-05 08:47:45 (GMT) |
| commit | 5db5a9d5d878157a643a441d426ff739084ca031 (patch) | |
| tree | d10017bbc11e62e44a7ced7e35de8516964e794a /src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp | |
| parent | 65c2d095cddfda32052925654dd1defd314ad4b3 (diff) | |
| parent | 84bbac2a4d7b663e57b74094cbebf8fca16e0ed8 (diff) | |
| download | Qt-5db5a9d5d878157a643a441d426ff739084ca031.zip Qt-5db5a9d5d878157a643a441d426ff739084ca031.tar.gz Qt-5db5a9d5d878157a643a441d426ff739084ca031.tar.bz2 | |
Merge branch 'master' of git://gitorious.org/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; |