diff options
Diffstat (limited to 'src/qml/qml/qqmlimport.cpp')
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 22 |
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); - } } } } |