From 1628d052fc533c319314f9910c318bffc96854ed Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 26 May 2016 13:04:10 +0200 Subject: [PATCH] QmlJS: Ensure linkImports() can be run in standalone test In standalone tests there is no instance of ExtensionSystem::PluginManager. Change-Id: I890016c4e0d2fbb41cfc0a5614e936d31e43cd0f Reviewed-by: Marco Benelli --- src/libs/qmljs/qmljslink.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp index 4becf6e011d..606475a35be 100644 --- a/src/libs/qmljs/qmljslink.cpp +++ b/src/libs/qmljs/qmljslink.cpp @@ -212,10 +212,12 @@ Context::ImportsPerDocument LinkPrivate::linkImports() Imports *imports = new Imports(valueOwner); // Add custom imports for the opened document - auto providers = ExtensionSystem::PluginManager::getObjects(); - foreach (const auto &provider, providers) - foreach (const auto &import, provider->imports(valueOwner, document.data())) - importCache.insert(ImportCacheKey(import.info), import); + if (ExtensionSystem::PluginManager::instance()) { + auto providers = ExtensionSystem::PluginManager::getObjects(); + foreach (const auto &provider, providers) + foreach (const auto &import, provider->imports(valueOwner, document.data())) + importCache.insert(ImportCacheKey(import.info), import); + } populateImportedTypes(imports, document); importsPerDocument.insert(document.data(), QSharedPointer(imports));