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

ProjectEplorer: Base ToolChain on AspectContainer

Browse Source 
Similar approach as done with ProjectConfiguration

Change-Id: Ia5e1d464b7c5c64d7a12ee12c7673ff453f24390
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-07-20 17:15:13 +02:00
parent a38c8a88b2
commit 32850e7fcc
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/toolchain.cpp
View File

@@ -246,6 +246,8 @@ ToolChain *ToolChain::clone() const
void ToolChain::toMap(QVariantMap &result) const void ToolChain::toMap(QVariantMap &result) const
{ {
AspectContainer::toMap(result);
QString idToSave = d->m_typeId.toString() + QLatin1Char(':') + QString::fromUtf8(id()); QString idToSave = d->m_typeId.toString() + QLatin1Char(':') + QString::fromUtf8(id());
result.insert(QLatin1String(ID_KEY), idToSave); result.insert(QLatin1String(ID_KEY), idToSave);
result.insert(QLatin1String(DISPLAY_NAME_KEY), displayName()); result.insert(QLatin1String(DISPLAY_NAME_KEY), displayName());
@@ -353,6 +355,8 @@ void ToolChain::setTypeDisplayName(const QString &typeName)
bool ToolChain::fromMap(const QVariantMap &data) bool ToolChain::fromMap(const QVariantMap &data)
{ {
AspectContainer::fromMap(data);
d->m_displayName = data.value(QLatin1String(DISPLAY_NAME_KEY)).toString(); d->m_displayName = data.value(QLatin1String(DISPLAY_NAME_KEY)).toString();
// make sure we have new style ids: // make sure we have new style ids:

3
src/plugins/projectexplorer/toolchain.h
View File

@@ -12,6 +12,7 @@
#include "task.h" #include "task.h"
#include "toolchaincache.h" #include "toolchaincache.h"
#include <utils/aspects.h>
#include <utils/cpplanguage_details.h> #include <utils/cpplanguage_details.h>
#include <utils/environment.h> #include <utils/environment.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
@@ -60,7 +61,7 @@ public:
// ToolChain (documentation inside) // ToolChain (documentation inside)
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
class PROJECTEXPLORER_EXPORT ToolChain class PROJECTEXPLORER_EXPORT ToolChain : public Utils::AspectContainer
{ {
public: public:
enum Detection { enum Detection {