diff options
Diffstat (limited to 'src/qml/qml/v8/qjsvalue.cpp')
| -rw-r--r-- | src/qml/qml/v8/qjsvalue.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/qml/qml/v8/qjsvalue.cpp b/src/qml/qml/v8/qjsvalue.cpp index 7a1b794737..32fd249b29 100644 --- a/src/qml/qml/v8/qjsvalue.cpp +++ b/src/qml/qml/v8/qjsvalue.cpp @@ -53,6 +53,7 @@ #include "qv4v8_p.h" #include "qv4variantobject_p.h" #include "qv4regexpobject_p.h" +#include "qv8engine_p.h" /*! \since 5.0 @@ -924,8 +925,12 @@ bool QJSValue::hasOwnProperty(const QString &name) const */ QObject *QJSValue::toQObject() const { - // ### - return 0; + Object *o = d->value.asObject(); + if (!o) + return 0; + + QV8Engine *v8 = d->engine()->publicEngine->handle(); + return v8->toQObject(d->value); } /*! @@ -974,8 +979,12 @@ bool QJSValue::isRegExp() const */ bool QJSValue::isQObject() const { - // ### - return false; + Object *o = d->value.asObject(); + if (!o) + return false; + + QV8Engine *v8 = d->engine()->publicEngine->handle(); + return v8->isQObject(d->value); } QT_END_NAMESPACE |