Fix QJSValue::toVariant and isVariant

Change-Id: I7360e37e34756e26f3e8936751c6b65a9d0a2167
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/src/qml/qml/v8/qjsvalue.cpp b/src/qml/qml/v8/qjsvalue.cpp
index 293e32f..8705a41 100644 (file)
--- a/src/qml/qml/v8/qjsvalue.cpp
+++ b/src/qml/qml/v8/qjsvalue.cpp
@@ -51,6 +51,7 @@
 #include "qv4dateobject_p.h"
 #include "qv4runtime_p.h"
 #include "qv4v8_p.h"
+#include "qv8variantwrapper_p.h"
 
 /*!
   \since 5.0
@@ -317,8 +318,11 @@ bool QJSValue::isCallable() const
 */
 bool QJSValue::isVariant() const
 {
-    // ###
-    return false;
+    QV4::ExecutionEngine *e = d->engine();
+    if (!e)
+        return false;
+
+    return QV8VariantWrapper::isVariant(d->value);
 }
 
 /*!
@@ -458,8 +462,7 @@ quint32 QJSValue::toUInt() const
 */
 QVariant QJSValue::toVariant() const
 {
-    // ###
-    return QVariant();
+    return QV8VariantWrapper::toVariant(d->value);
 }
 
 /*!

diff --git a/src/qml/qml/v8/qv8variantwrapper_p.h b/src/qml/qml/v8/qv8variantwrapper_p.h
index 2615fd1..b1b515e 100644 (file)
--- a/src/qml/qml/v8/qv8variantwrapper_p.h
+++ b/src/qml/qml/v8/qv8variantwrapper_p.h
@@ -73,7 +73,7 @@ public:
     void destroy();
 
     v8::Handle<v8::Object> newVariant(const QVariant &);
-    bool isVariant(v8::Handle<v8::Value>);
+    static bool isVariant(v8::Handle<v8::Value>);
     static QVariant toVariant(v8::Handle<v8::Object>);
     static QVariant toVariant(QV8ObjectResource *);
     QVariant &variantValue(v8::Handle<v8::Value>);