diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-27 11:44:36 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-27 11:44:36 (GMT) |
| commit | 6f9e2fb5cb496b826cb41a8127dd57e58d6c5103 (patch) | |
| tree | 5cff842e7d7aa639c5a7228af527ac89e4487619 /src/3rdparty/webkit/JavaScriptCore | |
| parent | c4279ec239e03c8f23bc73416291ad087cc36c4c (diff) | |
| parent | f60fedcb490f31576665194153f871eabaf20617 (diff) | |
| download | Qt-6f9e2fb5cb496b826cb41a8127dd57e58d6c5103.zip Qt-6f9e2fb5cb496b826cb41a8127dd57e58d6c5103.tar.gz Qt-6f9e2fb5cb496b826cb41a8127dd57e58d6c5103.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp index 40d2182..2563848 100644 --- a/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp @@ -58,6 +58,10 @@ #include "SamplingTool.h" #include <stdio.h> +#ifdef QT_BUILD_SCRIPT_LIB +#include "bridge/qscriptobject_p.h" +#endif + using namespace std; namespace JSC { @@ -1470,7 +1474,11 @@ DEFINE_STUB_FUNCTION(JSObject*, op_construct_JSConstruct) structure = asObject(stackFrame.args[3].jsValue())->inheritorID(); else structure = constructor->scope().node()->globalObject()->emptyObjectStructure(); +#ifdef QT_BUILD_SCRIPT_LIB + return new (stackFrame.globalData) QScriptObject(structure); +#else return new (stackFrame.globalData) JSObject(structure); +#endif } DEFINE_STUB_FUNCTION(EncodedJSValue, op_construct_NotJSConstruct) |