diff options
author | Kent Hansen <khansen@trolltech.com> | 2009-08-05 08:09:08 (GMT) |
---|---|---|
committer | Kent Hansen <khansen@trolltech.com> | 2009-08-05 08:09:37 (GMT) |
commit | f2f593c68f5c4e63fb78cf789f94ed2d42522498 (patch) | |
tree | 718a3371fa3acd294b94f22517590343caf35247 /src/3rdparty/webkit/JavaScriptCore/runtime/ConstructData.cpp | |
parent | cefaaf4cfcd8e4f75539d303ac10185427e193a8 (diff) | |
download | Qt-f2f593c68f5c4e63fb78cf789f94ed2d42522498.zip Qt-f2f593c68f5c4e63fb78cf789f94ed2d42522498.tar.gz Qt-f2f593c68f5c4e63fb78cf789f94ed2d42522498.tar.bz2 |
add ifdefs for qtscript-specific changes
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/ConstructData.cpp')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/ConstructData.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/ConstructData.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/ConstructData.cpp index b19ae04..051f310 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/ConstructData.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/ConstructData.cpp @@ -25,17 +25,20 @@ #include "config.h" #include "ConstructData.h" +#ifdef QT_BUILD_SCRIPT_LIB #include "ExceptionHelpers.h" #include "Interpreter.h" +#include "JSGlobalObject.h" +#endif #include "JSFunction.h" -#include "JSGlobalObject.h" namespace JSC { JSObject* construct(ExecState* exec, JSValue callee, ConstructType constructType, const ConstructData& constructData, const ArgList& args) { if (constructType == ConstructTypeHost) { +#ifdef QT_BUILD_SCRIPT_LIB Structure* structure; JSValue prototype = callee.get(exec, exec->propertyNames().prototype); if (prototype.isObject()) @@ -61,6 +64,9 @@ JSObject* construct(ExecState* exec, JSValue callee, ConstructType constructType JSObject *result = constructData.native.function(newCallFrame, asObject(callee), args); interp->registerFile().shrink(oldEnd); return result; +#else + return constructData.native.function(exec, asObject(object), args); +#endif } ASSERT(constructType == ConstructTypeJS); // FIXME: Can this be done more efficiently using the constructData? |