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

ProjectExplorer: Fix use of build step list preamble messages

Browse Source 
The step list names are computed separately anyway, having an
extra preamble consisting of concatenated build list names on
one line looks unnecessary.

Change-Id: If754c6363042927210dfd09c23f2f494081f8c47
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-02-28 09:05:46 +01:00
parent e7784b592d
commit fbd1574a85
4 changed files with 12 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -278,10 +278,7 @@ void CMakeBuildConfiguration::setConfigurationForCMake(const QList<ConfigModel::
return item.key.startsWith("ANDROID_BUILD_ABI_"); return item.key.startsWith("ANDROID_BUILD_ABI_");
}) != -1) { }) != -1) {
// We always need to clean when we change the ANDROID_BUILD_ABI_ variables // We always need to clean when we change the ANDROID_BUILD_ABI_ variables
QList<ProjectExplorer::BuildStepList *> stepLists; BuildManager::buildLists({cleanSteps()});
const Core::Id clean = ProjectExplorer::Constants::BUILDSTEPS_CLEAN;
stepLists << cleanSteps();
BuildManager::buildLists(stepLists, QStringList() << ProjectExplorerPlugin::displayNameForStepId(clean));
} }
} }

10
src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
View File

@@ -542,17 +542,13 @@ void QbsProjectManagerPlugin::runStepsForProducts(QbsProject *project,
bc->setChangedFiles(QStringList()); bc->setChangedFiles(QStringList());
bc->setProducts(products); bc->setProducts(products);
QList<ProjectExplorer::BuildStepList *> stepLists; QList<ProjectExplorer::BuildStepList *> stepLists;
QStringList stepListNames;
for (const Core::Id &stepType : stepTypes) { for (const Core::Id &stepType : stepTypes) {
if (stepType == ProjectExplorer::Constants::BUILDSTEPS_BUILD) { if (stepType == ProjectExplorer::Constants::BUILDSTEPS_BUILD)
stepLists << bc->buildSteps(); stepLists << bc->buildSteps();
stepListNames << ProjectExplorerPlugin::displayNameForStepId(stepType); else if (stepType == ProjectExplorer::Constants::BUILDSTEPS_CLEAN)
} else if (stepType == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
stepLists << bc->cleanSteps(); stepLists << bc->cleanSteps();
stepListNames << ProjectExplorerPlugin::displayNameForStepId(stepType);
} }
} BuildManager::buildLists(stepLists);
BuildManager::buildLists(stepLists, stepListNames);
bc->setProducts(QStringList()); bc->setProducts(QStringList());
} }

15
src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
View File

@@ -528,19 +528,12 @@ void QmakeProjectManagerPluginPrivate::handleSubDirContextMenu(Action action, bo
if (isFileBuild) if (isFileBuild)
bc->setFileNodeBuild(buildableFile); bc->setFileNodeBuild(buildableFile);
if (ProjectExplorerPlugin::saveModifiedFiles()) { if (ProjectExplorerPlugin::saveModifiedFiles()) {
const Core::Id buildStep = ProjectExplorer::Constants::BUILDSTEPS_BUILD; if (action == BUILD)
const Core::Id cleanStep = ProjectExplorer::Constants::BUILDSTEPS_CLEAN;
if (action == BUILD) {
BuildManager::buildList(bc->buildSteps()); BuildManager::buildList(bc->buildSteps());
} else if (action == CLEAN) { else if (action == CLEAN)
BuildManager::buildList(bc->cleanSteps()); BuildManager::buildList(bc->cleanSteps());
} else if (action == REBUILD) { else if (action == REBUILD)
QStringList names; BuildManager::buildLists({bc->cleanSteps(), bc->buildSteps()});
names << ProjectExplorerPlugin::displayNameForStepId(cleanStep)
<< ProjectExplorerPlugin::displayNameForStepId(buildStep);
BuildManager::buildLists({bc->cleanSteps(), bc->buildSteps()}, names);
}
} }
bc->setSubNodeBuild(nullptr); bc->setSubNodeBuild(nullptr);

21
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -569,14 +569,8 @@ QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step)
connect(step->target(), &Target::kitChanged, this, &QMakeStepConfigWidget::qtVersionChanged); connect(step->target(), &Target::kitChanged, this, &QMakeStepConfigWidget::qtVersionChanged);
connect(abisListWidget, &QListWidget::itemChanged, this, [this]{ connect(abisListWidget, &QListWidget::itemChanged, this, [this]{
abisChanged(); abisChanged();
QmakeBuildConfiguration *bc = m_step->qmakeBuildConfiguration(); if (QmakeBuildConfiguration *bc = m_step->qmakeBuildConfiguration())
if (!bc) BuildManager::buildLists({bc->cleanSteps()});
return;
QList<ProjectExplorer::BuildStepList *> stepLists;
const Core::Id clean = ProjectExplorer::Constants::BUILDSTEPS_CLEAN;
stepLists << bc->cleanSteps();
BuildManager::buildLists(stepLists, {ProjectExplorerPlugin::displayNameForStepId(clean)});
}); });
auto chooser = new Core::VariableChooser(qmakeAdditonalArgumentsLineEdit); auto chooser = new Core::VariableChooser(qmakeAdditonalArgumentsLineEdit);
chooser->addMacroExpanderProvider([step] { return step->macroExpander(); }); chooser->addMacroExpanderProvider([step] { return step->macroExpander(); });
@@ -749,15 +743,8 @@ void QMakeStepConfigWidget::updateEffectiveQMakeCall()
void QMakeStepConfigWidget::recompileMessageBoxFinished(int button) void QMakeStepConfigWidget::recompileMessageBoxFinished(int button)
{ {
if (button == QMessageBox::Yes) { if (button == QMessageBox::Yes) {
BuildConfiguration *bc = m_step->buildConfiguration(); if (BuildConfiguration *bc = m_step->buildConfiguration())
if (!bc) BuildManager::buildLists({bc->cleanSteps(), bc->buildSteps()});
return;
const Core::Id clean = ProjectExplorer::Constants::BUILDSTEPS_CLEAN;
const Core::Id build = ProjectExplorer::Constants::BUILDSTEPS_BUILD;
BuildManager::buildLists({bc->cleanSteps(), bc->buildSteps()},
QStringList() << ProjectExplorerPlugin::displayNameForStepId(clean)
<< ProjectExplorerPlugin::displayNameForStepId(build));
} }
} }