feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

PluginManager: Behave more like a package manager

Browse Source 
Instead of implicitly disabling plugins if their dependencies are
disabled, implicitly enable plugins if some enabled plugin needs it.
That will avoid issues if people disable plugins (e.g. QmlJSTools et al)
and we later add one of these as a dependency to another plugin (e.g.
make QmakeProjectManager depend on QmlJSTools), which resulted in the
previously enabled plugin being implicitly disabled.

Enabling a plugin in About Plugins now asks for all required
dependencies to be enabled as well.
Disabling a plugin in About Plugins now asks for disabling all plugins
that require it.
Using the -noload command line option now disables all plugins that
require it in addition.
Using the -load command line option now implicitly enables all plugins
that are required.
Multiple -noload and -load options are handled in the order given on the
command line.

Task-number: QTCREATORBUG-9131
Change-Id: I0956106105060a7898a8992e0629009d5ec3ea4d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-03-31 17:42:14 +02:00
parent ed9104bad6
commit 33a5e7d804
10 changed files with 176 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/libs/extensionsystem/pluginmanager.cpp
View File

@@ -376,12 +376,62 @@ bool PluginManager::hasError()
{
foreach (PluginSpec *spec, plugins()) {
// only show errors on startup if plugin is enabled.
if (spec->hasError() && spec->isEnabledBySettings() && !spec->isDisabledIndirectly())
if (spec->hasError() && spec->isEffectivelyEnabled())
return true;
}
return false;
}
/*!
Returns all plugins that require \a spec to be loaded. Recurses into dependencies.
*/
QSet<PluginSpec *> PluginManager::pluginsRequiringPlugin(PluginSpec *spec)
{
QSet<PluginSpec *> dependingPlugins;
dependingPlugins.insert(spec);
foreach (PluginSpec *checkSpec, d->loadQueue()) {
QHashIterator<PluginDependency, PluginSpec *> depIt(checkSpec->dependencySpecs());
while (depIt.hasNext()) {
depIt.next();
if (depIt.key().type != PluginDependency::Required)
continue;
if (dependingPlugins.contains(depIt.value())) {
dependingPlugins.insert(checkSpec);
break; // no use to check other dependencies, continue with load queue
}
}
}
dependingPlugins.remove(spec);
return dependingPlugins;
}
/*!
Returns all plugins that \a spec requires to be loaded. Recurses into dependencies.
*/
QSet<PluginSpec *> PluginManager::pluginsRequiredByPlugin(PluginSpec *spec)
{
QSet<PluginSpec *> recursiveDependencies;
recursiveDependencies.insert(spec);
QList<PluginSpec *> queue;
queue.append(spec);
while (!queue.isEmpty()) {
PluginSpec *checkSpec = queue.takeFirst();
QHashIterator<PluginDependency, PluginSpec *> depIt(checkSpec->dependencySpecs());
while (depIt.hasNext()) {
depIt.next();
if (depIt.key().type != PluginDependency::Required)
continue;
PluginSpec *depSpec = depIt.value();
if (!recursiveDependencies.contains(depSpec)) {
recursiveDependencies.insert(depSpec);
queue.append(depSpec);
}
}
}
recursiveDependencies.remove(spec);
return recursiveDependencies;
}
/*!
Shuts down and deletes all plugins.
*/
@@ -647,10 +697,10 @@ static inline void formatOption(QTextStream &str,
void PluginManager::formatOptions(QTextStream &str, int optionIndentation, int descriptionIndentation)
{
formatOption(str, QLatin1String(OptionsParser::LOAD_OPTION),
QLatin1String("plugin"), QLatin1String("Load <plugin>"),
QLatin1String("plugin"), QLatin1String("Load <plugin> and all plugins that it requires"),
optionIndentation, descriptionIndentation);
formatOption(str, QLatin1String(OptionsParser::NO_LOAD_OPTION),
QLatin1String("plugin"), QLatin1String("Do not load <plugin>"),
QLatin1String("plugin"), QLatin1String("Do not load <plugin> and all plugins that require it"),
optionIndentation, descriptionIndentation);
formatOption(str, QLatin1String(OptionsParser::PROFILE_OPTION),
QString(), QLatin1String("Profile plugin loading"),
@@ -1422,11 +1472,15 @@ void PluginManagerPrivate::readPluginPaths()
void PluginManagerPrivate::resolveDependencies()
{
foreach (PluginSpec *spec, pluginSpecs) {
spec->d->enabledIndirectly = false; // reset, is recalculated below
spec->d->resolveDependencies(pluginSpecs);
}
foreach (PluginSpec *spec, loadQueue()) {
spec->d->disableIndirectlyIfDependencyDisabled();
QListIterator<PluginSpec *> it(loadQueue());
it.toBack();
while (it.hasPrevious()) {
PluginSpec *spec = it.previous();
spec->d->enableDependenciesIndirectly();
}
}