diff options
| author | axis <qt-info@nokia.com> | 2009-11-10 12:02:51 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-10 12:02:51 (GMT) |
| commit | b8e8fa9aa4684c345ec55cc41f690e78f9b4a3c0 (patch) | |
| tree | 7c79470413a171e2ad43e8fe7730e2e74770ca32 /src/script/api/qscriptvalue.cpp | |
| parent | 0ce94a763cfa9ec0829e096795a52446c74e4557 (diff) | |
| parent | 99f4379d397eacbdcffc40d6906175aa04d78456 (diff) | |
| download | Qt-b8e8fa9aa4684c345ec55cc41f690e78f9b4a3c0.zip Qt-b8e8fa9aa4684c345ec55cc41f690e78f9b4a3c0.tar.gz Qt-b8e8fa9aa4684c345ec55cc41f690e78f9b4a3c0.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Diffstat (limited to 'src/script/api/qscriptvalue.cpp')
| -rw-r--r-- | src/script/api/qscriptvalue.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp index 52a1e6d..d6cbb41 100644 --- a/src/script/api/qscriptvalue.cpp +++ b/src/script/api/qscriptvalue.cpp @@ -71,6 +71,7 @@ #include "bridge/qscriptclassobject_p.h" #include "bridge/qscriptvariant_p.h" #include "bridge/qscriptqobject_p.h" +#include "bridge/qscriptdeclarativeclass_p.h" /*! \since 4.3 @@ -1496,6 +1497,8 @@ QVariant QScriptValue::toVariant() const #endif else if (isArray()) return QScriptEnginePrivate::variantListFromArray(*this); + else if (QScriptDeclarativeClass *dc = QScriptDeclarativeClass::scriptClass(*this)) + return dc->toVariant(QScriptDeclarativeClass::object(*this)); // try to convert to primitive JSC::ExecState *exec = d->engine->currentFrame; JSC::JSValue savedException; @@ -1586,6 +1589,8 @@ QObject *QScriptValue::toQObject() const if (isQObject()) { QScriptObject *object = static_cast<QScriptObject*>(JSC::asObject(d->jscValue)); return static_cast<QScript::QObjectDelegate*>(object->delegate())->value(); + } else if (QScriptDeclarativeClass *dc = QScriptDeclarativeClass::scriptClass(*this)) { + return dc->toQObject(QScriptDeclarativeClass::object(*this)); } else if (isVariant()) { QVariant var = toVariant(); int type = var.userType(); |