diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-03-23 09:17:38 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-03-23 09:17:38 (GMT) |
| commit | 8b2c3f7d5259fa6d5b24b090f662c03c16ea9ecb (patch) | |
| tree | be4aaba0a2628cb9782c3954b7bb677b8afc365c /src/script/api/qscriptengine.cpp | |
| parent | 49ced5b0145598e3eda3375480e915c725bcb81f (diff) | |
| parent | 6a54124fefb786f4bad8fc778d174890fb1824f4 (diff) | |
| download | Qt-8b2c3f7d5259fa6d5b24b090f662c03c16ea9ecb.zip Qt-8b2c3f7d5259fa6d5b24b090f662c03c16ea9ecb.tar.gz Qt-8b2c3f7d5259fa6d5b24b090f662c03c16ea9ecb.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 294c3a0..356b4d0 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -3318,7 +3318,7 @@ void QScriptEngine::installTranslatorFunctions(const QScriptValue &object) JSC::JSValue jscObject = d->scriptValueToJSCValue(object); JSC::JSGlobalObject *glob = d->originalGlobalObject(); if (!jscObject || !jscObject.isObject()) - jscObject = glob; + jscObject = d->globalObject(); // unsigned attribs = JSC::DontEnum; JSC::asObject(jscObject)->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 5, JSC::Identifier(exec, "qsTranslate"), QScript::functionQsTranslate)); JSC::asObject(jscObject)->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 2, JSC::Identifier(exec, "QT_TRANSLATE_NOOP"), QScript::functionQsTranslateNoOp)); |