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

Core/Utils: Migrate further to Utils::Id

Browse Source 
The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-06-26 13:59:38 +02:00
parent 4924392620
commit 430a33dcd9
655 changed files with 2115 additions and 2093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
View File

@@ -31,7 +31,7 @@
#include "mesonpluginconstants.h"
#include <settings/general/settings.h>
#include <settings/tools/kitaspect/ninjatoolkitaspect.h>
#include <coreplugin/id.h>
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/processparameters.h>
@@ -43,7 +43,7 @@ namespace Internal {
const char TARGETS_KEY[] = "MesonProjectManager.BuildStep.BuildTargets";
const char TOOL_ARGUMENTS_KEY[] = "MesonProjectManager.BuildStep.AdditionalArguments";
NinjaBuildStep::NinjaBuildStep(ProjectExplorer::BuildStepList *bsl, Core::Id id)
NinjaBuildStep::NinjaBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id)
: ProjectExplorer::AbstractProcessStep{bsl, id}
{
setDefaultDisplayName(tr("Meson Build"));
@@ -116,7 +116,7 @@ QString NinjaBuildStep::defaultBuildTarget() const
{
const ProjectExplorer::BuildStepList *const bsl = stepList();
QTC_ASSERT(bsl, return {});
const Core::Id parentId = bsl->id();
const Utils::Id parentId = bsl->id();
if (parentId == ProjectExplorer::Constants::BUILDSTEPS_CLEAN)
return {Constants::Targets::clean};
if (parentId == ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)