diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-24 00:00:19 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-24 00:00:19 (GMT) |
| commit | 56fe1454fe08ec7cc258cbbd38486e721d088c99 (patch) | |
| tree | 597051d1f3b73595f48bcad5a5acb24026c6ba66 /src/script/bridge/qscriptclassobject.cpp | |
| parent | e26db74521e063a1513731eb14581d93a3d77481 (diff) | |
| parent | af4f30abb88d242d1e310914b53bc91b24e45a59 (diff) | |
| download | Qt-56fe1454fe08ec7cc258cbbd38486e721d088c99.zip Qt-56fe1454fe08ec7cc258cbbd38486e721d088c99.tar.gz Qt-56fe1454fe08ec7cc258cbbd38486e721d088c99.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
doc/src/declarative/advtutorial1.qdoc
src/declarative/qml/qmlmoduleplugin.cpp
src/declarative/util/qmlxmllistmodel.cpp
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) |