From 32850e7fcca2b4ab945e83103d61c8e75ed52816 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 20 Jul 2023 17:15:13 +0200
Subject: [PATCH] ProjectEplorer: Base ToolChain on AspectContainer

Similar approach as done with ProjectConfiguration

Change-Id: Ia5e1d464b7c5c64d7a12ee12c7673ff453f24390
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/plugins/projectexplorer/toolchain.cpp | 4 ++++
 src/plugins/projectexplorer/toolchain.h   | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index 4373114a028..aed69cea3c2 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -246,6 +246,8 @@ ToolChain *ToolChain::clone() const
 
 void ToolChain::toMap(QVariantMap &result) const
 {
+    AspectContainer::toMap(result);
+
     QString idToSave = d->m_typeId.toString() + QLatin1Char(':') + QString::fromUtf8(id());
     result.insert(QLatin1String(ID_KEY), idToSave);
     result.insert(QLatin1String(DISPLAY_NAME_KEY), displayName());
@@ -353,6 +355,8 @@ void ToolChain::setTypeDisplayName(const QString &typeName)
 
 bool ToolChain::fromMap(const QVariantMap &data)
 {
+    AspectContainer::fromMap(data);
+
     d->m_displayName = data.value(QLatin1String(DISPLAY_NAME_KEY)).toString();
 
     // make sure we have new style ids:
diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h
index f1a0894ef31..66c9edd6614 100644
--- a/src/plugins/projectexplorer/toolchain.h
+++ b/src/plugins/projectexplorer/toolchain.h
@@ -12,6 +12,7 @@
 #include "task.h"
 #include "toolchaincache.h"
 
+#include <utils/aspects.h>
 #include <utils/cpplanguage_details.h>
 #include <utils/environment.h>
 #include <utils/fileutils.h>
@@ -60,7 +61,7 @@ public:
 // ToolChain (documentation inside)
 // --------------------------------------------------------------------------
 
-class PROJECTEXPLORER_EXPORT ToolChain
+class PROJECTEXPLORER_EXPORT ToolChain : public Utils::AspectContainer
 {
 public:
     enum Detection {