From fbd1574a854c477f18aebcea772431a042e9227e Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 28 Feb 2020 09:05:46 +0100 Subject: [PATCH] ProjectExplorer: Fix use of build step list preamble messages 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 --- .../cmakebuildconfiguration.cpp | 5 +---- .../qbsprojectmanagerplugin.cpp | 10 +++------ .../qmakeprojectmanagerplugin.cpp | 15 ++++--------- src/plugins/qmakeprojectmanager/qmakestep.cpp | 21 ++++--------------- 4 files changed, 12 insertions(+), 39 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index db375496cda..bbad42f18ff 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -278,10 +278,7 @@ void CMakeBuildConfiguration::setConfigurationForCMake(const QList stepLists; - const Core::Id clean = ProjectExplorer::Constants::BUILDSTEPS_CLEAN; - stepLists << cleanSteps(); - BuildManager::buildLists(stepLists, QStringList() << ProjectExplorerPlugin::displayNameForStepId(clean)); + BuildManager::buildLists({cleanSteps()}); } } diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp index e9f8e64ea33..d0da8a47e0d 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp @@ -542,17 +542,13 @@ void QbsProjectManagerPlugin::runStepsForProducts(QbsProject *project, bc->setChangedFiles(QStringList()); bc->setProducts(products); QList stepLists; - QStringList stepListNames; for (const Core::Id &stepType : stepTypes) { - if (stepType == ProjectExplorer::Constants::BUILDSTEPS_BUILD) { + if (stepType == ProjectExplorer::Constants::BUILDSTEPS_BUILD) stepLists << bc->buildSteps(); - stepListNames << ProjectExplorerPlugin::displayNameForStepId(stepType); - } else if (stepType == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) { + else if (stepType == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) stepLists << bc->cleanSteps(); - stepListNames << ProjectExplorerPlugin::displayNameForStepId(stepType); - } } - BuildManager::buildLists(stepLists, stepListNames); + BuildManager::buildLists(stepLists); bc->setProducts(QStringList()); } diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp index c0f4a0c9446..054871bf37c 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp @@ -528,19 +528,12 @@ void QmakeProjectManagerPluginPrivate::handleSubDirContextMenu(Action action, bo if (isFileBuild) bc->setFileNodeBuild(buildableFile); if (ProjectExplorerPlugin::saveModifiedFiles()) { - const Core::Id buildStep = ProjectExplorer::Constants::BUILDSTEPS_BUILD; - const Core::Id cleanStep = ProjectExplorer::Constants::BUILDSTEPS_CLEAN; - if (action == BUILD) { + if (action == BUILD) BuildManager::buildList(bc->buildSteps()); - } else if (action == CLEAN) { + else if (action == CLEAN) BuildManager::buildList(bc->cleanSteps()); - } else if (action == REBUILD) { - QStringList names; - names << ProjectExplorerPlugin::displayNameForStepId(cleanStep) - << ProjectExplorerPlugin::displayNameForStepId(buildStep); - - BuildManager::buildLists({bc->cleanSteps(), bc->buildSteps()}, names); - } + else if (action == REBUILD) + BuildManager::buildLists({bc->cleanSteps(), bc->buildSteps()}); } bc->setSubNodeBuild(nullptr); diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index f4df59dd89d..7bee09695f0 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -569,14 +569,8 @@ QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step) connect(step->target(), &Target::kitChanged, this, &QMakeStepConfigWidget::qtVersionChanged); connect(abisListWidget, &QListWidget::itemChanged, this, [this]{ abisChanged(); - QmakeBuildConfiguration *bc = m_step->qmakeBuildConfiguration(); - if (!bc) - return; - - QList stepLists; - const Core::Id clean = ProjectExplorer::Constants::BUILDSTEPS_CLEAN; - stepLists << bc->cleanSteps(); - BuildManager::buildLists(stepLists, {ProjectExplorerPlugin::displayNameForStepId(clean)}); + if (QmakeBuildConfiguration *bc = m_step->qmakeBuildConfiguration()) + BuildManager::buildLists({bc->cleanSteps()}); }); auto chooser = new Core::VariableChooser(qmakeAdditonalArgumentsLineEdit); chooser->addMacroExpanderProvider([step] { return step->macroExpander(); }); @@ -749,15 +743,8 @@ void QMakeStepConfigWidget::updateEffectiveQMakeCall() void QMakeStepConfigWidget::recompileMessageBoxFinished(int button) { if (button == QMessageBox::Yes) { - BuildConfiguration *bc = m_step->buildConfiguration(); - if (!bc) - 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)); + if (BuildConfiguration *bc = m_step->buildConfiguration()) + BuildManager::buildLists({bc->cleanSteps(), bc->buildSteps()}); } }