diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-23 06:51:56 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-23 06:51:56 (GMT) |
| commit | 369afa4bcee7addbf1a7e8556cf0b521bb75c57d (patch) | |
| tree | 11fc05b6aa85397d0384a14917c07bb3c0d964cf /src/script/api/qscriptengine.cpp | |
| parent | 91c1ec98c10d8ce89932f7df69e3de33d80beeff (diff) | |
| parent | 0873efff5197cb92bce378c67cd744753f809bae (diff) | |
| download | Qt-369afa4bcee7addbf1a7e8556cf0b521bb75c57d.zip Qt-369afa4bcee7addbf1a7e8556cf0b521bb75c57d.tar.gz Qt-369afa4bcee7addbf1a7e8556cf0b521bb75c57d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 7a910d2..71194d3 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -508,6 +508,7 @@ JSC::JSValue JSC_HOST_CALL functionDisconnect(JSC::ExecState *exec, JSC::JSObjec slot = arg1; else { // ### don't go via QScriptValue + QScript::SaveFrameHelper saveFrame(engine, exec); QScriptValue tmp = engine->scriptValueFromJSCValue(arg0); QString propertyName(arg1.toString(exec)); slot = engine->scriptValueToJSCValue(tmp.property(propertyName, QScriptValue::ResolvePrototype)); @@ -591,6 +592,7 @@ JSC::JSValue JSC_HOST_CALL functionConnect(JSC::ExecState *exec, JSC::JSObject * slot = arg1; else { // ### don't go via QScriptValue + QScript::SaveFrameHelper saveFrame(engine, exec); QScriptValue tmp = engine->scriptValueFromJSCValue(arg0); QString propertyName = arg1.toString(exec); slot = engine->scriptValueToJSCValue(tmp.property(propertyName, QScriptValue::ResolvePrototype)); |