This method is only used one place, so inline it there

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

1 files changed, 16 insertions, 1 deletions

diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp
index 4cfae02e9a..11b7dad8eb 100644
--- a/src/qml/jsapi/qjsvalue.cpp
+++ b/src/qml/jsapi/qjsvalue.cpp
@@ -516,7 +516,22 @@ QVariant QJSValue::toVariant() const
     if (d->value.isEmpty())
         return d->unboundData;
 
-    return QV4::VariantObject::toVariant(d->value);
+    if (d->value.asObject())
+        return QV8Engine::toVariant(d->value.engine(), d->value, /*typeHint*/ -1, /*createJSValueForObjects*/ false);
+
+    if (d->value.isString())
+        return QVariant(d->value.stringValue()->toQString());
+    if (d->value.isBoolean())
+        return QVariant(d->value.booleanValue());
+    if (d->value.isNumber()) {
+        if (d->value.isInt32())
+            return QVariant(d->value.integerValue());
+        return QVariant(d->value.asDouble());
+    }
+    if (d->value.isNull())
+        return QVariant(QMetaType::VoidStar, 0);
+    Q_ASSERT(d->value.isUndefined());
+    return QVariant();
 }
 
 /*!