1 files changed, 9 insertions, 4 deletions
diff --git a/src/qml/qml/qqmltypewrapper.cpp b/src/qml/qml/qqmltypewrapper.cpp
index 26f035705c..7270cffb00 100644
--- a/src/qml/qml/qqmltypewrapper.cpp
+++ b/src/qml/qml/qqmltypewrapper.cpp
@@ -95,12 +95,17 @@ QObject* QQmlTypeWrapper::singletonObject() const
 
 QVariant QQmlTypeWrapper::toVariant() const
 {
-    QObject *qobjectSingleton = singletonObject();
-    if (qobjectSingleton)
+    // Only Singleton type wrappers can be converted to a variant.
+    if (!isSingleton())
+        return QVariant();
+
+    QQmlEngine *e = engine()->qmlEngine();
+    QQmlType::SingletonInstanceInfo *siinfo = d()->type().singletonInstanceInfo();
+    siinfo->init(e);
+    if (QObject *qobjectSingleton = siinfo->qobjectApi(e))
         return QVariant::fromValue<QObject*>(qobjectSingleton);
 
-    // only QObject Singleton Type can be converted to a variant.
-    return QVariant();
+    return QVariant::fromValue<QJSValue>(siinfo->scriptApi(e));
 }