diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index e13d12c9d8c..b6a8b2564c5 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -442,6 +442,20 @@ const Internal::CompileOutputSettings &BuildManager::compileOutputSettings() return d->m_outputWindow->settings(); } +QString BuildManager::displayNameForStepId(Id stepId) +{ + if (stepId == Constants::BUILDSTEPS_CLEAN) { + //: Displayed name for a "cleaning" build step + return tr("Clean"); + } + if (stepId == Constants::BUILDSTEPS_DEPLOY) { + //: Displayed name for a deploy step + return tr("Deploy"); + } + //: Displayed name for a normal build step + return tr("Build"); +} + void BuildManager::cancel() { if (d->m_running) { @@ -775,7 +789,7 @@ bool BuildManager::buildLists(const QList bsls, const QStringLi QStringList stepListNames; for (BuildStepList *list : bsls) { steps.append(list->steps()); - stepListNames.append(ProjectExplorerPlugin::displayNameForStepId(list->id())); + stepListNames.append(displayNameForStepId(list->id())); d->m_isDeploying = d->m_isDeploying || list->id() == Constants::BUILDSTEPS_DEPLOY; } diff --git a/src/plugins/projectexplorer/buildmanager.h b/src/plugins/projectexplorer/buildmanager.h index d62786ed817..f50b458b235 100644 --- a/src/plugins/projectexplorer/buildmanager.h +++ b/src/plugins/projectexplorer/buildmanager.h @@ -91,6 +91,8 @@ public: static void setCompileOutputSettings(const Internal::CompileOutputSettings &settings); static const Internal::CompileOutputSettings &compileOutputSettings(); + static QString displayNameForStepId(Core::Id stepId); + public slots: static void cancel(); // Shows without focus diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 8897638ff65..e866f8b2e18 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -2713,17 +2713,6 @@ ProjectExplorerPluginPrivate::ProjectExplorerPluginPrivate() m_allProjectDirectoriesFilter.setIsCustomFilter(false); } -QString ProjectExplorerPlugin::displayNameForStepId(Id stepId) -{ - if (stepId == Constants::BUILDSTEPS_CLEAN) - return tr("Clean"); - if (stepId == Constants::BUILDSTEPS_BUILD) - return tr("Build", "Build step"); - if (stepId == Constants::BUILDSTEPS_DEPLOY) - return tr("Deploy"); - return tr("Build", "Build step"); -} - void ProjectExplorerPluginPrivate::runProjectContextMenu() { const Node *node = ProjectTree::currentNode(); diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h index c7b7a19f5e4..d14177e96e3 100644 --- a/src/plugins/projectexplorer/projectexplorer.h +++ b/src/plugins/projectexplorer/projectexplorer.h @@ -162,8 +162,6 @@ public: static void initiateInlineRenaming(); - static QString displayNameForStepId(Core::Id stepId); - static QStringList projectFileGlobs(); static QThreadPool *sharedThreadPool(); diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index 632782b11dd..4cd0ab3d9ac 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -850,7 +850,7 @@ bool QmakeBuildConfiguration::regenerateBuildFiles(Node *node) qs->setForced(true); BuildManager::buildList(cleanSteps()); - BuildManager::appendStep(qs, ProjectExplorerPlugin::displayNameForStepId(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)); + BuildManager::appendStep(qs, BuildManager::displayNameForStepId(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)); QmakeProFileNode *proFile = nullptr; if (node && node != target()->project()->rootProjectNode())