diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-23 20:44:44 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-23 20:44:44 (GMT) |
| commit | ac67986f156861a7e64ed80a3a23db19fba8df6a (patch) | |
| tree | 26602e5314cbf73e91c78f885b1d5b583efad6ea /src/script/bridge/qscriptclassobject.cpp | |
| parent | 01116bb669f072af2227fff5f9da33bc77af7256 (diff) | |
| parent | 95e0e5b70b677a7468648a8ccc8d8ae553c3ca30 (diff) | |
| download | Qt-ac67986f156861a7e64ed80a3a23db19fba8df6a.zip Qt-ac67986f156861a7e64ed80a3a23db19fba8df6a.tar.gz Qt-ac67986f156861a7e64ed80a3a23db19fba8df6a.tar.bz2 | |
Merge remote branch 'staging/master' into bearermanagement/staging
Diffstat (limited to 'src/script/bridge/qscriptclassobject.cpp')
| -rw-r--r-- | src/script/bridge/qscriptclassobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/bridge/qscriptclassobject.cpp b/src/script/bridge/qscriptclassobject.cpp index a3dd239..ce0a08e 100644 --- a/src/script/bridge/qscriptclassobject.cpp +++ b/src/script/bridge/qscriptclassobject.cpp @@ -206,7 +206,7 @@ JSC::JSValue JSC_HOST_CALL ClassObjectDelegate::call(JSC::ExecState *exec, JSC:: QVariant result = scriptClass->extension(QScriptClass::Callable, qVariantFromValue(ctx)); eng_p->popContext(); eng_p->currentFrame = oldFrame; - return eng_p->jscValueFromVariant(result); + return QScriptEnginePrivate::jscValueFromVariant(exec, result); } JSC::ConstructType ClassObjectDelegate::getConstructData(QScriptObject*, JSC::ConstructData &constructData) |