diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-06 17:54:27 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-06 17:54:27 (GMT) |
| commit | 468bd5ac176c42af310d439810bbd3bb561f5a1b (patch) | |
| tree | 60d34f3ec64d4f9e6c299a7c3b1ae5767fc3085c /src/script/api/qscriptengine.cpp | |
| parent | fd7188e9f07204b39da2cc6c3b605311517561d0 (diff) | |
| parent | 90ebbabf0b2a6b3fe008fb8d98da0df6a12a720c (diff) | |
| download | Qt-468bd5ac176c42af310d439810bbd3bb561f5a1b.zip Qt-468bd5ac176c42af310d439810bbd3bb561f5a1b.tar.gz Qt-468bd5ac176c42af310d439810bbd3bb561f5a1b.tar.bz2 | |
Merge branch '4.6'
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 3402190..b1f36be 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -993,7 +993,7 @@ void QScriptEnginePrivate::setDefaultPrototype(int metaTypeId, JSC::JSValue prot QScriptContext *QScriptEnginePrivate::contextForFrame(JSC::ExecState *frame) { - if (frame && frame->callerFrame()->hasHostCallFrameFlag() + if (frame && frame->callerFrame()->hasHostCallFrameFlag() && !frame->callee() && frame->callerFrame()->removeHostCallFrameFlag() == QScript::scriptEngineFromExec(frame)->globalExec()) { //skip the "fake" context created in Interpreter::execute. frame = frame->callerFrame()->removeHostCallFrameFlag(); @@ -1116,8 +1116,7 @@ uint QScriptEnginePrivate::contextFlags(JSC::ExecState *exec) void QScriptEnginePrivate::setContextFlags(JSC::ExecState *exec, uint flags) { Q_ASSERT(!exec->codeBlock()); - quintptr flag_ptr = flags; - exec->registers()[JSC::RegisterFile::ReturnValueRegister] = JSC::JSValue(reinterpret_cast<JSC::JSObject*>(flag_ptr)); + exec->registers()[JSC::RegisterFile::ReturnValueRegister] = JSC::Register::withInt(flags); } |