Refactor singleton type registration code

Previously each singleton type was registered as an implicit separate
import.  This commit changes the code so that these types are treated
just like any other type in the registration sense.

It also ensures that singleton types are instantiated per-engine.

Change-Id: I5c81c4ca5bf65210f7125d74a62a282a21838068
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>

1 files changed, 2 insertions, 20 deletions

diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
index 739492b3d3..63f49a2a03 100644
--- a/src/qml/qml/qqmlimport.cpp
+++ b/src/qml/qml/qqmlimport.cpp
@@ -290,23 +290,15 @@ QUrl QQmlImports::baseUrl() const
     return d->baseUrl;
 }
 
-void QQmlImports::populateCache(QQmlTypeNameCache *cache, QQmlEngine *engine) const
+void QQmlImports::populateCache(QQmlTypeNameCache *cache) const
 {
     const QQmlImportNamespace &set = d->unqualifiedset;
 
     for (int ii = set.imports.count() - 1; ii >= 0; --ii) {
         const QQmlImportNamespace::Import *import = set.imports.at(ii);
         QQmlTypeModule *module = QQmlMetaType::typeModule(import->uri, import->majversion);
-        if (module)
+        if (module) {
             cache->m_anonymousImports.append(QQmlTypeModuleVersion(module, import->minversion));
-
-        QQmlMetaType::SingletonType singletonType = QQmlMetaType::singletonType(import->uri, import->majversion,
-                                                                    import->minversion);
-        if (singletonType.script || singletonType.qobject) {
-            QQmlEnginePrivate *ep = QQmlEnginePrivate::get(engine);
-            QQmlMetaType::SingletonInstance *apiInstance = ep->singletonTypeInstance(singletonType);
-
-            cache->addSingletonType(singletonType.typeName, apiInstance);
         }
     }
 
@@ -321,16 +313,6 @@ void QQmlImports::populateCache(QQmlTypeNameCache *cache, QQmlEngine *engine) co
                 QQmlTypeNameCache::Import &typeimport = cache->m_namedImports[set.prefix];
                 typeimport.modules.append(QQmlTypeModuleVersion(module, import->minversion));
             }
-
-            QQmlMetaType::SingletonType singletonType = QQmlMetaType::singletonType(import->uri, import->majversion,
-                                                                        import->minversion);
-            if (singletonType.script || singletonType.qobject) {
-                QQmlEnginePrivate *ep = QQmlEnginePrivate::get(engine);
-                QQmlMetaType::SingletonInstance *apiInstance = ep->singletonTypeInstance(singletonType);
-
-                cache->add(set.prefix);
-                cache->addSingletonType(singletonType.typeName, apiInstance, set.prefix);
-            }
         }
     }
 }