Move the qmlSingletonWrapper method out of the contextwrapper

One more step towards removing the class alltogether.

Change-Id: Ic9f6794eb3c5c6605ee43ad23a6d432ebbf321a1
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 21 insertions, 0 deletions

diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 7424dc4e4c..caf07e8b0b 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -759,6 +759,27 @@ QObject *ExecutionEngine::qmlScopeObject() const
     return qmlContextObject()->scopeObject;
 }
 
+ReturnedValue ExecutionEngine::qmlSingletonWrapper(String *name)
+{
+    QQmlContextData *ctx = callingQmlContext();
+    if (!ctx->imports)
+        return Encode::undefined();
+    // Search for attached properties, enums and imported scripts
+    QQmlTypeNameCache::Result r = ctx->imports->query(name);
+
+    Q_ASSERT(r.isValid());
+    Q_ASSERT(r.type);
+    Q_ASSERT(r.type->isSingleton());
+
+    QQmlType::SingletonInstanceInfo *siinfo = r.type->singletonInstanceInfo();
+    QQmlEngine *e = qmlEngine();
+    siinfo->init(e);
+
+    if (QObject *qobjectSingleton = siinfo->qobjectApi(e))
+        return QV4::QObjectWrapper::wrap(this, qobjectSingleton);
+    return QJSValuePrivate::convertedToValue(this, siinfo->scriptApi(e));
+}
+
 QQmlContextData *ExecutionEngine::callingQmlContext() const
 {
     Heap::QmlContextWrapper *w = qmlContextObject();