diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-10 09:33:25 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-10 09:33:25 (GMT) |
| commit | 80b91eeb991bd6962feb4bdb1f492fcd807389a0 (patch) | |
| tree | 826cf1b92ecf3778b926d312e9e244c49e50b00d /src | |
| parent | 692f13f4980cf13acef3164bfe2d89721e09a406 (diff) | |
| download | Qt-80b91eeb991bd6962feb4bdb1f492fcd807389a0.zip Qt-80b91eeb991bd6962feb4bdb1f492fcd807389a0.tar.gz Qt-80b91eeb991bd6962feb4bdb1f492fcd807389a0.tar.bz2 | |
don't add the jscprint function when building QtScript
QtScript defines its own print function.
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.cpp index 3514040..55286d3 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.cpp @@ -340,8 +340,10 @@ void JSGlobalObject::reset(JSValue prototype) putDirectFunctionWithoutTransition(exec, new (exec) NativeFunctionWrapper(exec, d()->prototypeFunctionStructure.get(), 1, Identifier(exec, "encodeURI"), globalFuncEncodeURI), DontEnum); putDirectFunctionWithoutTransition(exec, new (exec) NativeFunctionWrapper(exec, d()->prototypeFunctionStructure.get(), 1, Identifier(exec, "encodeURIComponent"), globalFuncEncodeURIComponent), DontEnum); #ifndef NDEBUG +#ifndef QT_BUILD_SCRIPT_LIB putDirectFunctionWithoutTransition(exec, new (exec) NativeFunctionWrapper(exec, d()->prototypeFunctionStructure.get(), 1, Identifier(exec, "jscprint"), globalFuncJSCPrint), DontEnum); #endif +#endif resetPrototype(prototype); } |