Core/Utils: Migrate further to Utils::Id

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

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
(cherry picked from commit 430a33dcd9ac80ddb848e41f8f059102857c88aa)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

25 files changed, 58 insertions, 60 deletions

diff --git a/src/plugins/mesonprojectmanager/exewrappers/mesontools.cpp b/src/plugins/mesonprojectmanager/exewrappers/mesontools.cpp
index 9c773818c8..4b63d1ac12 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/mesontools.cpp
+++ b/src/plugins/mesonprojectmanager/exewrappers/mesontools.cpp
@@ -34,7 +34,7 @@ inline bool is(const MesonTools::Tool_t &tool)
 }
 
 template<typename T>
-std::shared_ptr<T> tool(const Core::Id &id, const std::vector<MesonTools::Tool_t> &tools)
+std::shared_ptr<T> tool(const Utils::Id &id, const std::vector<MesonTools::Tool_t> &tools)
 {
     static_assert(std::is_base_of<ToolWrapper, T>::value, "Type must derive from ToolWrapper");
     const auto tool = std::find_if(std::cbegin(tools),
@@ -89,11 +89,11 @@ void MesonTools::setTools(std::vector<MesonTools::Tool_t> &&tools)
     fixAutoDetected<NinjaWrapper>(self->m_tools);
 }
 
-std::shared_ptr<NinjaWrapper> MesonTools::ninjaWrapper(const Core::Id &id)
+std::shared_ptr<NinjaWrapper> MesonTools::ninjaWrapper(const Utils::Id &id)
 {
     return tool<NinjaWrapper>(id, MesonTools::instance()->m_tools);
 }
-std::shared_ptr<MesonWrapper> MesonTools::mesonWrapper(const Core::Id &id)
+std::shared_ptr<MesonWrapper> MesonTools::mesonWrapper(const Utils::Id &id)
 {
     return tool<MesonWrapper>(id, MesonTools::instance()->m_tools);
 }
diff --git a/src/plugins/mesonprojectmanager/exewrappers/mesontools.h b/src/plugins/mesonprojectmanager/exewrappers/mesontools.h
index 35337d4fc4..f3d4f12887 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/mesontools.h
+++ b/src/plugins/mesonprojectmanager/exewrappers/mesontools.h
@@ -50,7 +50,7 @@ public:
     static bool isMesonWrapper(const Tool_t &tool);
     static bool isNinjaWrapper(const Tool_t &tool);
 
-    static inline void addTool(const Core::Id &itemId,
+    static inline void addTool(const Utils::Id &itemId,
                                const QString &name,
                                const Utils::FilePath &exe)
     {
@@ -72,7 +72,7 @@ public:
 
     static inline const std::vector<Tool_t> &tools() { return instance()->m_tools; }
 
-    static inline void updateTool(const Core::Id &itemId,
+    static inline void updateTool(const Utils::Id &itemId,
                                   const QString &name,
                                   const Utils::FilePath &exe)
     {
@@ -87,7 +87,7 @@ public:
             addTool(itemId, name, exe);
         }
     }
-    static void removeTool(const Core::Id &id)
+    static void removeTool(const Utils::Id &id)
     {
         auto self = instance();
         auto item = Utils::take(self->m_tools, [&id](const auto &item) { return item->id() == id; });
@@ -95,8 +95,8 @@ public:
         emit self->toolRemoved(*item);
     }
 
-    static std::shared_ptr<NinjaWrapper> ninjaWrapper(const Core::Id &id);
-    static std::shared_ptr<MesonWrapper> mesonWrapper(const Core::Id &id);
+    static std::shared_ptr<NinjaWrapper> ninjaWrapper(const Utils::Id &id);
+    static std::shared_ptr<MesonWrapper> mesonWrapper(const Utils::Id &id);
 
     static std::shared_ptr<NinjaWrapper> ninjaWrapper();
     static std::shared_ptr<MesonWrapper> mesonWrapper();
diff --git a/src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.h b/src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.h
index 5bdaba7882..7053244f62 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.h
+++ b/src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.h
@@ -28,8 +28,8 @@
 #include "toolwrapper.h"
 #include "utils/environment.h"
 #include "utils/fileutils.h"
+#include <utils/id.h>
 #include "utils/optional.h"
-#include <coreplugin/id.h>
 #include <tuple>
 #include <QFile>
 #include <QFileInfo>
@@ -120,7 +120,7 @@ inline MesonWrapper *fromVariantMap<MesonWrapper *>(const QVariantMap &data)
 {
     return new MesonWrapper(data[Constants::ToolsSettings::NAME_KEY].toString(),
                             Utils::FilePath::fromVariant(data[Constants::ToolsSettings::EXE_KEY]),
-                            Core::Id::fromSetting(data[Constants::ToolsSettings::ID_KEY]),
+                            Utils::Id::fromSetting(data[Constants::ToolsSettings::ID_KEY]),
                             data[Constants::ToolsSettings::AUTO_DETECTED_KEY].toBool());
 }
 
diff --git a/src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h b/src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h
index 8566f27523..a4fca60ed9 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h
+++ b/src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h
@@ -56,7 +56,7 @@ inline NinjaWrapper *fromVariantMap<NinjaWrapper *>(const QVariantMap &data)
 {
     return new NinjaWrapper(data[Constants::ToolsSettings::NAME_KEY].toString(),
                             Utils::FilePath::fromVariant(data[Constants::ToolsSettings::EXE_KEY]),
-                            Core::Id::fromSetting(data[Constants::ToolsSettings::ID_KEY]),
+                            Utils::Id::fromSetting(data[Constants::ToolsSettings::ID_KEY]),
                             data[Constants::ToolsSettings::AUTO_DETECTED_KEY].toBool());
 }
 
diff --git a/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.cpp b/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.cpp
index a89d2bf336..716026c66c 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.cpp
+++ b/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.cpp
@@ -31,14 +31,14 @@ ToolWrapper::ToolWrapper(const QString &name, const Utils::FilePath &path, bool
     : m_version(read_version(path))
     , m_isValid{path.exists() && m_version.isValid}
     , m_autoDetected{autoDetected}
-    , m_id{Core::Id::fromString(QUuid::createUuid().toString())}
+    , m_id{Utils::Id::fromString(QUuid::createUuid().toString())}
     , m_exe{path}
     , m_name{name}
 {}
 
 ToolWrapper::ToolWrapper(const QString &name,
                          const Utils::FilePath &path,
-                         const Core::Id &id,
+                         const Utils::Id &id,
                          bool autoDetected)
     : m_version(read_version(path))
     , m_isValid{path.exists() && m_version.isValid}
@@ -47,7 +47,7 @@ ToolWrapper::ToolWrapper(const QString &name,
     , m_exe{path}
     , m_name{name}
 {
-    QTC_ASSERT(m_id.isValid(), m_id = Core::Id::fromString(QUuid::createUuid().toString()));
+    QTC_ASSERT(m_id.isValid(), m_id = Utils::Id::fromString(QUuid::createUuid().toString()));
 }
 
 void ToolWrapper::setExe(const Utils::FilePath &newExe)
diff --git a/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.h b/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.h
index 717b38e4c1..5f58dbac31 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.h
+++ b/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.h
@@ -23,9 +23,9 @@
 **
 ****************************************************************************/
 #pragma once
-#include <coreplugin/id.h>
 #include <utils/environment.h>
 #include <utils/fileutils.h>
+#include <utils/id.h>
 #include <utils/qtcassert.h>
 #include <versionhelper.h>
 #include <QFileInfo>
@@ -64,7 +64,7 @@ public:
     ToolWrapper(const QString &name, const Utils::FilePath &path, bool autoDetected = false);
     ToolWrapper(const QString &name,
                 const Utils::FilePath &path,
-                const Core::Id &id,
+                const Utils::Id &id,
                 bool autoDetected = false);
     ToolWrapper(const ToolWrapper &other) = default;
     ToolWrapper(ToolWrapper &&other) = default;
@@ -74,7 +74,7 @@ public:
     inline const Version &version() const noexcept { return m_version; };
     inline bool isValid() const noexcept { return m_isValid; };
     inline bool autoDetected() const noexcept { return m_autoDetected; };
-    inline Core::Id id() const noexcept { return m_id; };
+    inline Utils::Id id() const noexcept { return m_id; };
     inline Utils::FilePath exe() const noexcept { return m_exe; };
     inline QString name() const noexcept { return m_name; };
 
@@ -94,7 +94,7 @@ protected:
     Version m_version;
     bool m_isValid;
     bool m_autoDetected;
-    Core::Id m_id;
+    Utils::Id m_id;
     Utils::FilePath m_exe;
     QString m_name;
 };
diff --git a/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp b/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp
index a76e54590e..0736a69382 100644
--- a/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp
+++ b/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp
@@ -45,7 +45,7 @@
 
 namespace MesonProjectManager {
 namespace Internal {
-MesonBuildConfiguration::MesonBuildConfiguration(ProjectExplorer::Target *target, Core::Id id)
+MesonBuildConfiguration::MesonBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id)
     : ProjectExplorer::BuildConfiguration{target, id}
 {
     appendInitialBuildStep(Constants::MESON_BUILD_STEP_ID);
diff --git a/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h b/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h
index 8afd949a4f..4e36c843a2 100644
--- a/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h
+++ b/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 #pragma once
-#include "coreplugin/id.h"
+
 #include "projectexplorer/buildconfiguration.h"
 #include "projectexplorer/target.h"
 #include "utils/fileutils.h"
@@ -95,7 +95,7 @@ class MesonBuildConfiguration final : public ProjectExplorer::BuildConfiguration
 {
     Q_OBJECT
 public:
-    MesonBuildConfiguration(ProjectExplorer::Target *target, Core::Id id);
+    MesonBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id);
     ~MesonBuildConfiguration() final;
 
     static Utils::FilePath shadowBuildDirectory(
diff --git a/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp b/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp
index 6c34f50d3b..6161659a65 100644
--- a/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp
+++ b/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp
@@ -105,7 +105,7 @@ QStringList toAbsolutePath(const Utils::FilePath &refPath, QStringList &pathList
     return allAbs;
 }
 
-MesonProjectParser::MesonProjectParser(const Core::Id &meson,
+MesonProjectParser::MesonProjectParser(const Utils::Id &meson,
                                        Utils::Environment env,
                                        ProjectExplorer::Project *project)
     : m_env{env}
@@ -127,7 +127,7 @@ MesonProjectParser::MesonProjectParser(const Core::Id &meson,
     m_outputParser.setFileFinder(fileFinder);
 }
 
-void MesonProjectParser::setMesonTool(const Core::Id &meson)
+void MesonProjectParser::setMesonTool(const Utils::Id &meson)
 {
     m_meson = meson;
 }
diff --git a/src/plugins/mesonprojectmanager/project/mesonprojectparser.h b/src/plugins/mesonprojectmanager/project/mesonprojectparser.h
index 867af8135b..3eeb0ba910 100644
--- a/src/plugins/mesonprojectmanager/project/mesonprojectparser.h
+++ b/src/plugins/mesonprojectmanager/project/mesonprojectparser.h
@@ -52,8 +52,8 @@ class MesonProjectParser : public QObject
     };
 
 public:
-    MesonProjectParser(const Core::Id &meson, Utils::Environment env, ProjectExplorer::Project* project);
-    void setMesonTool(const Core::Id &meson);
+    MesonProjectParser(const Utils::Id &meson, Utils::Environment env, ProjectExplorer::Project* project);
+    void setMesonTool(const Utils::Id &meson);
     bool configure(const Utils::FilePath &sourcePath,
                    const Utils::FilePath &buildPath,
                    const QStringList &args);
@@ -112,7 +112,7 @@ private:
     MesonProcess m_process;
     MesonOutputParser m_outputParser;
     Utils::Environment m_env;
-    Core::Id m_meson;
+    Utils::Id m_meson;
     Utils::FilePath m_buildDir;
     Utils::FilePath m_srcDir;
     QFuture<ParserData *> m_parserFutureResult;
diff --git a/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.cpp b/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.cpp
index 2c4b1e9f6e..28e2a3579a 100644
--- a/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.cpp
+++ b/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.cpp
@@ -34,7 +34,7 @@
 #include <QLatin1String>
 namespace MesonProjectManager {
 namespace Internal {
-MesonRunConfiguration::MesonRunConfiguration(ProjectExplorer::Target *target, Core::Id id)
+MesonRunConfiguration::MesonRunConfiguration(ProjectExplorer::Target *target, Utils::Id id)
     : ProjectExplorer::RunConfiguration{target, id}
 {
     auto envAspect = addAspect<ProjectExplorer::LocalEnvironmentAspect>(target);
diff --git a/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.h b/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.h
index 4d31bc1bf1..896380d4c5 100644
--- a/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.h
+++ b/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.h
@@ -32,7 +32,7 @@ namespace Internal {
 class MesonRunConfiguration final : public ProjectExplorer::RunConfiguration
 {
 public:
-    MesonRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
+    MesonRunConfiguration(ProjectExplorer::Target *target, Utils::Id id);
 
 private:
     void updateTargetInformation();
diff --git a/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp b/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
index 5e701277dc..f39a7aaef1 100644
--- a/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
+++ b/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
@@ -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)
diff --git a/src/plugins/mesonprojectmanager/project/ninjabuildstep.h b/src/plugins/mesonprojectmanager/project/ninjabuildstep.h
index 12dc9c2b5a..ae50f4263a 100644
--- a/src/plugins/mesonprojectmanager/project/ninjabuildstep.h
+++ b/src/plugins/mesonprojectmanager/project/ninjabuildstep.h
@@ -36,7 +36,7 @@ class NinjaBuildStep final : public ProjectExplorer::AbstractProcessStep
 {
     Q_OBJECT
 public:
-    NinjaBuildStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
+    NinjaBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
     ProjectExplorer::BuildStepConfigWidget *createConfigWidget() final;
     Utils::CommandLine command();
     QStringList projectTargets();
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.cpp b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.cpp
index f8861f1e88..c98bf5db7c 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.cpp
@@ -82,16 +82,16 @@ ProjectExplorer::KitAspectWidget *MesonToolKitAspect::createConfigWidget(Project
     return new ToolKitAspectWidget{k, this, ToolKitAspectWidget::ToolType::Meson};
 }
 
-void MesonToolKitAspect::setMesonTool(ProjectExplorer::Kit *kit, Core::Id id)
+void MesonToolKitAspect::setMesonTool(ProjectExplorer::Kit *kit, Utils::Id id)
 {
     QTC_ASSERT(kit && id.isValid(), return );
     kit->setValue(TOOL_ID, id.toSetting());
 }
 
-Core::Id MesonToolKitAspect::mesonToolId(const ProjectExplorer::Kit *kit)
+Utils::Id MesonToolKitAspect::mesonToolId(const ProjectExplorer::Kit *kit)
 {
     QTC_ASSERT(kit, return {});
-    return Core::Id::fromSetting(kit->value(TOOL_ID));
+    return Utils::Id::fromSetting(kit->value(TOOL_ID));
 }
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.h b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.h
index 759cdae319..ea2bd8fc8b 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.h
@@ -26,7 +26,6 @@
 #pragma once
 #include <exewrappers/mesontools.h>
 
-#include <coreplugin/id.h>
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitmanager.h>
 
@@ -43,8 +42,8 @@ public:
     ItemList toUserOutput(const ProjectExplorer::Kit *k) const final;
     ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *) const final;
 
-    static void setMesonTool(ProjectExplorer::Kit *kit, Core::Id id);
-    static Core::Id mesonToolId(const ProjectExplorer::Kit *kit);
+    static void setMesonTool(ProjectExplorer::Kit *kit, Utils::Id id);
+    static Utils::Id mesonToolId(const ProjectExplorer::Kit *kit);
 
     static inline decltype(auto) mesonTool(const ProjectExplorer::Kit *kit)
     {
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.cpp b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.cpp
index aaa41f3228..d5fafc3e37 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.cpp
@@ -82,16 +82,16 @@ ProjectExplorer::KitAspectWidget *NinjaToolKitAspect::createConfigWidget(Project
     return new ToolKitAspectWidget{k, this, ToolKitAspectWidget::ToolType::Ninja};
 }
 
-void NinjaToolKitAspect::setNinjaTool(ProjectExplorer::Kit *kit, Core::Id id)
+void NinjaToolKitAspect::setNinjaTool(ProjectExplorer::Kit *kit, Utils::Id id)
 {
     QTC_ASSERT(kit && id.isValid(), return );
     kit->setValue(TOOL_ID, id.toSetting());
 }
 
-Core::Id NinjaToolKitAspect::ninjaToolId(const ProjectExplorer::Kit *kit)
+Utils::Id NinjaToolKitAspect::ninjaToolId(const ProjectExplorer::Kit *kit)
 {
     QTC_ASSERT(kit, return {});
-    return Core::Id::fromSetting(kit->value(TOOL_ID));
+    return Utils::Id::fromSetting(kit->value(TOOL_ID));
 }
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.h b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.h
index 59e869af8c..64c10c6a9b 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.h
@@ -26,7 +26,6 @@
 #pragma once
 #include <exewrappers/mesontools.h>
 
-#include <coreplugin/id.h>
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitmanager.h>
 
@@ -43,8 +42,8 @@ public:
     ItemList toUserOutput(const ProjectExplorer::Kit *k) const final;
     ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *) const final;
 
-    static void setNinjaTool(ProjectExplorer::Kit *kit, Core::Id id);
-    static Core::Id ninjaToolId(const ProjectExplorer::Kit *kit);
+    static void setNinjaTool(ProjectExplorer::Kit *kit, Utils::Id id);
+    static Utils::Id ninjaToolId(const ProjectExplorer::Kit *kit);
 
     static inline decltype(auto) ninjaTool(const ProjectExplorer::Kit *kit)
     {
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.cpp b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.cpp
index 64d7439045..76ee4543d9 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.cpp
@@ -92,17 +92,17 @@ void ToolKitAspectWidget::removeTool(const MesonTools::Tool_t &tool)
 
 void ToolKitAspectWidget::setCurrentToolIndex(int index)
 {
-    const Core::Id id = Core::Id::fromSetting(m_toolsComboBox->itemData(index));
+    const Utils::Id id = Utils::Id::fromSetting(m_toolsComboBox->itemData(index));
     if (m_type == ToolType::Meson)
         MesonToolKitAspect::setMesonTool(m_kit, id);
     else
         NinjaToolKitAspect::setNinjaTool(m_kit, id);
 }
 
-int ToolKitAspectWidget::indexOf(const Core::Id &id)
+int ToolKitAspectWidget::indexOf(const Utils::Id &id)
 {
     for (int i = 0; i < m_toolsComboBox->count(); ++i) {
-        if (id == Core::Id::fromSetting(m_toolsComboBox->itemData(i)))
+        if (id == Utils::Id::fromSetting(m_toolsComboBox->itemData(i)))
             return i;
     }
     return -1;
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.h b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.h
index b217232cf4..af2af7c12e 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.h
@@ -50,7 +50,7 @@ private:
     void addTool(const MesonTools::Tool_t &tool);
     void removeTool(const MesonTools::Tool_t &tool);
     void setCurrentToolIndex(int index);
-    int indexOf(const Core::Id &id);
+    int indexOf(const Utils::Id &id);
     bool isCompatible(const MesonTools::Tool_t &tool);
     void loadTools();
     void setToDefault();
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h b/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h
index 08f2d1f42b..9a692b00c1 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h
@@ -24,7 +24,7 @@
 ****************************************************************************/
 
 #pragma once
-#include "coreplugin/id.h"
+#include "utils/id.h"
 #include "utils/fileutils.h"
 #include "utils/optional.h"
 #include <QWidget>
@@ -47,11 +47,11 @@ public:
     ~ToolItemSettings();
     void load(ToolTreeItem *item);
     void store();
-    Q_SIGNAL void applyChanges(Core::Id itemId, const QString &name, const Utils::FilePath &exe);
+    Q_SIGNAL void applyChanges(Utils::Id itemId, const QString &name, const Utils::FilePath &exe);
 
 private:
     Ui::ToolItemSettings *ui;
-    Utils::optional<Core::Id> m_currentId{Utils::nullopt};
+    Utils::optional<Utils::Id> m_currentId{Utils::nullopt};
 };
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp b/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp
index de13515a5a..f30d6b5b53 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp
@@ -47,7 +47,7 @@ ToolTreeItem *ToolsModel::mesoneToolTreeItem(const QModelIndex &index) const
     return itemForIndexAtLevel<2>(index);
 }
 
-void ToolsModel::updateItem(const Core::Id &itemId, const QString &name, const Utils::FilePath &exe)
+void ToolsModel::updateItem(const Utils::Id &itemId, const QString &name, const Utils::FilePath &exe)
 {
     auto treeItem = findItemAtLevel<2>([itemId](ToolTreeItem *n) { return n->id() == itemId; });
     QTC_ASSERT(treeItem, return );
@@ -62,7 +62,7 @@ void ToolsModel::addMesonTool()
 void ToolsModel::removeMesonTool(ToolTreeItem *item)
 {
     QTC_ASSERT(item, return );
-    const Core::Id id = item->id();
+    const Utils::Id id = item->id();
     destroyItem(item);
     m_itemsToRemove.enqueue(id);
 }
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.h b/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.h
index 3707dc63c2..8bbcc1bb38 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.h
@@ -41,7 +41,7 @@ class ToolsModel final : public Utils::TreeModel<Utils::TreeItem, Utils::TreeIte
 public:
     ToolsModel();
     ToolTreeItem *mesoneToolTreeItem(const QModelIndex &index) const;
-    void updateItem(const Core::Id &itemId, const QString &name, const Utils::FilePath &exe);
+    void updateItem(const Utils::Id &itemId, const QString &name, const Utils::FilePath &exe);
     void addMesonTool();
     void removeMesonTool(ToolTreeItem *item);
     ToolTreeItem *cloneMesonTool(ToolTreeItem *item);
@@ -52,7 +52,7 @@ private:
     QString uniqueName(const QString &baseName);
     Utils::TreeItem *autoDetectedGroup() const;
     Utils::TreeItem *manualGroup() const;
-    QQueue<Core::Id> m_itemsToRemove;
+    QQueue<Utils::Id> m_itemsToRemove;
 };
 } // namespace Internal
 } // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.cpp b/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.cpp
index b7abb4dfee..3fe2374242 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.cpp
@@ -33,7 +33,7 @@ namespace Internal {
 ToolTreeItem::ToolTreeItem(const QString &name)
     : m_name{name}
     , m_autoDetected{false}
-    , m_id(Core::Id::fromString(QUuid::createUuid().toString()))
+    , m_id(Utils::Id::fromString(QUuid::createUuid().toString()))
     , m_unsavedChanges{true}
 {
     self_check();
@@ -54,7 +54,7 @@ ToolTreeItem::ToolTreeItem(const ToolTreeItem &other)
     : m_name{tr("Clone of %1").arg(other.m_name)}
     , m_executable{other.m_executable}
     , m_autoDetected{false}
-    , m_id{Core::Id::fromString(QUuid::createUuid().toString())}
+    , m_id{Utils::Id::fromString(QUuid::createUuid().toString())}
     , m_unsavedChanges{true}
 {
     self_check();
diff --git a/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.h b/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.h
index 029d00ea05..6b6946364e 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.h
+++ b/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.h
@@ -26,7 +26,7 @@
 #pragma once
 #include "toolssettingspage.h"
 #include <exewrappers/mesontools.h>
-#include <coreplugin/id.h>
+#include <utils/id.h>
 #include <utils/fileutils.h>
 #include <utils/optional.h>
 #include <utils/treemodel.h>
@@ -46,7 +46,7 @@ public:
     inline bool isAutoDetected() const noexcept { return m_autoDetected; }
     inline QString name() const noexcept { return m_name; }
     inline Utils::FilePath executable() const noexcept { return m_executable; }
-    inline Core::Id id() const noexcept { return m_id; }
+    inline Utils::Id id() const noexcept { return m_id; }
     inline bool hasUnsavedChanges() const noexcept { return m_unsavedChanges; }
     inline void setSaved() { m_unsavedChanges = false; }
     void update(const QString &name, const Utils::FilePath &exe);
@@ -62,7 +62,7 @@ private:
     bool m_pathExists;
     bool m_pathIsFile;
     bool m_pathIsExecutable;
-    Core::Id m_id;
+    Utils::Id m_id;
 
     bool m_unsavedChanges = false;
 };