diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index b239171fb5f..39ddb536a39 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -167,7 +167,6 @@ FileName CMakeBuildConfiguration::shadowBuildDirectory(const FileName &projectFi void CMakeBuildConfiguration::buildTarget(const QString &buildTarget) { const Core::Id buildStep = ProjectExplorer::Constants::BUILDSTEPS_BUILD; - const QString name = ProjectExplorer::ProjectExplorerPlugin::displayNameForStepId(buildStep); CMakeBuildStep *cmBs = qobject_cast(Utils::findOrDefault(stepList(buildStep)->steps(), [](const ProjectExplorer::BuildStep *bs) { @@ -180,7 +179,7 @@ void CMakeBuildConfiguration::buildTarget(const QString &buildTarget) cmBs->setBuildTarget(buildTarget); } - BuildManager::buildList(stepList(buildStep), name); + BuildManager::buildList(stepList(buildStep)); if (cmBs) cmBs->setBuildTarget(originalBuildTarget); diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index ca47ec0b200..ac23d7f3e72 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -518,16 +518,19 @@ bool BuildManager::buildQueueAppend(const QList &steps, QStringList return true; } -bool BuildManager::buildList(BuildStepList *bsl, const QString &stepListName) +bool BuildManager::buildList(BuildStepList *bsl) { - return buildLists(QList() << bsl, QStringList() << stepListName); + return buildLists({bsl}); } -bool BuildManager::buildLists(QList bsls, const QStringList &stepListNames, const QStringList &preambelMessage) +bool BuildManager::buildLists(QList bsls, const QStringList &preambelMessage) { QList steps; - foreach (BuildStepList *list, bsls) + QStringList stepListNames; + foreach (BuildStepList *list, bsls) { steps.append(list->steps()); + stepListNames.append(ProjectExplorerPlugin::displayNameForStepId(list->id())); + } QStringList names; names.reserve(steps.size()); diff --git a/src/plugins/projectexplorer/buildmanager.h b/src/plugins/projectexplorer/buildmanager.h index 349dad44ad0..b4cbcd19662 100644 --- a/src/plugins/projectexplorer/buildmanager.h +++ b/src/plugins/projectexplorer/buildmanager.h @@ -50,9 +50,9 @@ public: static bool isBuilding(); static bool tasksAvailable(); - static bool buildLists(QList bsls, const QStringList &stepListNames, - const QStringList &preambelMessage = QStringList()); - static bool buildList(BuildStepList *bsl, const QString &stepListName); + static bool buildLists(QList bsls, + const QStringList &preambelMessage = QStringList()); + static bool buildList(BuildStepList *bsl); static bool isBuilding(const Project *p); static bool isBuilding(const Target *t); diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 8387842bf04..86ca6bef34a 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -2396,7 +2396,6 @@ int ProjectExplorerPluginPrivate::queue(QList projects, QList ste } QList stepLists; - QStringList names; QStringList preambleMessage; foreach (Project *pro, projects) @@ -2417,14 +2416,13 @@ int ProjectExplorerPluginPrivate::queue(QList projects, QList ste if (!bsl || bsl->isEmpty()) continue; stepLists << bsl; - names << m_instance->displayNameForStepId(id); } } if (stepLists.isEmpty()) return 0; - if (!BuildManager::buildLists(stepLists, names, preambleMessage)) + if (!BuildManager::buildLists(stepLists, preambleMessage)) return -1; return stepLists.count(); } diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp index 99e9ed8a6d6..d95f54f03e3 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp @@ -594,8 +594,7 @@ void QbsProjectManagerPlugin::buildFiles(QbsProject *project, const QStringList const Core::Id buildStep = ProjectExplorer::Constants::BUILDSTEPS_BUILD; - const QString name = ProjectExplorerPlugin::displayNameForStepId(buildStep); - BuildManager::buildList(bc->stepList(buildStep), name); + BuildManager::buildList(bc->stepList(buildStep)); bc->setChangedFiles(QStringList()); bc->setActiveFileTags(QStringList()); diff --git a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp index 12122b5c066..a644ce6221c 100644 --- a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp +++ b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp @@ -101,8 +101,7 @@ void AndroidQmakeBuildConfiguration::manifestSaved() qs->setForced(true); - BuildManager::buildList(stepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN), - ProjectExplorerPlugin::displayNameForStepId(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)); + BuildManager::buildList(stepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)); BuildManager::appendStep(qs, ProjectExplorerPlugin::displayNameForStepId(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)); setSubNodeBuild(0); } diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.cpp index a75eb56e241..bfb7402bbb1 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.cpp @@ -238,11 +238,9 @@ void QmakeManager::handleSubDirContextMenu(QmakeManager::Action action, bool isF const Core::Id buildStep = ProjectExplorer::Constants::BUILDSTEPS_BUILD; const Core::Id cleanStep = ProjectExplorer::Constants::BUILDSTEPS_CLEAN; if (action == BUILD) { - const QString name = ProjectExplorerPlugin::displayNameForStepId(buildStep); - BuildManager::buildList(bc->stepList(buildStep), name); + BuildManager::buildList(bc->stepList(buildStep)); } else if (action == CLEAN) { - const QString name = ProjectExplorerPlugin::displayNameForStepId(cleanStep); - BuildManager::buildList(bc->stepList(cleanStep), name); + BuildManager::buildList(bc->stepList(cleanStep)); } else if (action == REBUILD) { QStringList names; names << ProjectExplorerPlugin::displayNameForStepId(cleanStep)