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

PluginManager: Add "-load all" and "-noload all" command line options

Browse Source 
Task-number: QTCREATORBUG-11826
Change-Id: Ia033c1f8c69bbb2c757a0d8284c56168ad88155c
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-03-30 17:50:25 +02:00
parent 33a5e7d804
commit 0a294eebe4
2 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/libs/extensionsystem/optionsparser.cpp
View File

@@ -147,16 +147,22 @@ bool OptionsParser::checkForLoadOption()
if (m_currentArg != QLatin1String(LOAD_OPTION)) if (m_currentArg != QLatin1String(LOAD_OPTION))
return false; return false;
if (nextToken(RequiredToken)) { if (nextToken(RequiredToken)) {
PluginSpec *spec = m_pmPrivate->pluginByName(m_currentArg); if (m_currentArg == QLatin1String("all")) {
if (!spec) { foreach (PluginSpec *spec, m_pmPrivate->pluginSpecs)
if (m_errorString) spec->d->setForceEnabled(true);
*m_errorString = QCoreApplication::translate("PluginManager",
"The plugin \"%1\" does not exist.")
.arg(m_currentArg);
m_hasError = true;
} else {
spec->d->setForceEnabled(true);
m_isDependencyRefreshNeeded = true; m_isDependencyRefreshNeeded = true;
} else {
PluginSpec *spec = m_pmPrivate->pluginByName(m_currentArg);
if (!spec) {
if (m_errorString)
*m_errorString = QCoreApplication::translate("PluginManager",
"The plugin \"%1\" does not exist.")
.arg(m_currentArg);
m_hasError = true;
} else {
spec->d->setForceEnabled(true);
m_isDependencyRefreshNeeded = true;
}
} }
} }
return true; return true;
@@ -167,18 +173,24 @@ bool OptionsParser::checkForNoLoadOption()
if (m_currentArg != QLatin1String(NO_LOAD_OPTION)) if (m_currentArg != QLatin1String(NO_LOAD_OPTION))
return false; return false;
if (nextToken(RequiredToken)) { if (nextToken(RequiredToken)) {
PluginSpec *spec = m_pmPrivate->pluginByName(m_currentArg); if (m_currentArg == QLatin1String("all")) {
if (!spec) { foreach (PluginSpec *spec, m_pmPrivate->pluginSpecs)
if (m_errorString) spec->d->setForceDisabled(true);
*m_errorString = QCoreApplication::translate("PluginManager",
"The plugin \"%1\" does not exist.").arg(m_currentArg);
m_hasError = true;
} else {
spec->d->setForceDisabled(true);
// recursively disable all plugins that require this plugin
foreach (PluginSpec *dependantSpec, PluginManager::pluginsRequiringPlugin(spec))
dependantSpec->d->setForceDisabled(true);
m_isDependencyRefreshNeeded = true; m_isDependencyRefreshNeeded = true;
} else {
PluginSpec *spec = m_pmPrivate->pluginByName(m_currentArg);
if (!spec) {
if (m_errorString)
*m_errorString = QCoreApplication::translate("PluginManager",
"The plugin \"%1\" does not exist.").arg(m_currentArg);
m_hasError = true;
} else {
spec->d->setForceDisabled(true);
// recursively disable all plugins that require this plugin
foreach (PluginSpec *dependantSpec, PluginManager::pluginsRequiringPlugin(spec))
dependantSpec->d->setForceDisabled(true);
m_isDependencyRefreshNeeded = true;
}
} }
} }
return true; return true;

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

@@ -699,9 +699,17 @@ void PluginManager::formatOptions(QTextStream &str, int optionIndentation, int d
formatOption(str, QLatin1String(OptionsParser::LOAD_OPTION), formatOption(str, QLatin1String(OptionsParser::LOAD_OPTION),
QLatin1String("plugin"), QLatin1String("Load <plugin> and all plugins that it requires"), QLatin1String("plugin"), QLatin1String("Load <plugin> and all plugins that it requires"),
optionIndentation, descriptionIndentation); optionIndentation, descriptionIndentation);
formatOption(str, QLatin1String(OptionsParser::LOAD_OPTION) + QLatin1String(" all"),
QString(), QLatin1String("Load all available plugins"),
optionIndentation, descriptionIndentation);
formatOption(str, QLatin1String(OptionsParser::NO_LOAD_OPTION), formatOption(str, QLatin1String(OptionsParser::NO_LOAD_OPTION),
QLatin1String("plugin"), QLatin1String("Do not load <plugin> and all plugins that require it"), QLatin1String("plugin"), QLatin1String("Do not load <plugin> and all plugins that require it"),
optionIndentation, descriptionIndentation); optionIndentation, descriptionIndentation);
formatOption(str, QLatin1String(OptionsParser::NO_LOAD_OPTION) + QLatin1String(" all"),
QString(), QString::fromLatin1("Do not load any plugin (useful when "
"followed by one or more \"%1\" arguments)")
.arg(QLatin1String(OptionsParser::LOAD_OPTION)),
optionIndentation, descriptionIndentation);
formatOption(str, QLatin1String(OptionsParser::PROFILE_OPTION), formatOption(str, QLatin1String(OptionsParser::PROFILE_OPTION),
QString(), QLatin1String("Profile plugin loading"), QString(), QLatin1String("Profile plugin loading"),
optionIndentation, descriptionIndentation); optionIndentation, descriptionIndentation);