From 433f8a32417143fd10afe1d011721ecb1974fbc0 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 17 Jul 2023 15:53:52 +0200 Subject: [PATCH] CMake: Remove an accidentally introduces second build dir aspect Not quite harmless, as it was destroying persistent data written by the normal one. Amends b9cf021b8edc. Change-Id: Ie2775881535c4d19174177f443a4606acc1576de Reviewed-by: Eike Ziller --- src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 2 +- src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index f5961f03aef..2ed08688cf5 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -1350,7 +1350,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id) { m_buildSystem = new CMakeBuildSystem(this); - buildDir.setValueAcceptor( + buildDirectoryAspect()->setValueAcceptor( [](const QString &oldDir, const QString &newDir) -> std::optional { if (oldDir.isEmpty()) return newDir; diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h index cee3ae64baa..a04de47196e 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h @@ -79,7 +79,6 @@ public: void setInitialCMakeArguments(const QStringList &args); void setCMakeBuildType(const QString &cmakeBuildType, bool quiet = false); - ProjectExplorer::BuildDirectoryAspect buildDir{this, this}; Internal::InitialCMakeArgumentsAspect initialCMakeArguments{this}; Utils::StringAspect additionalCMakeOptions{this}; Utils::FilePathAspect sourceDirectory{this};