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

CMake: Remove an accidentally introduces second build dir aspect

Browse Source 
Not quite harmless, as it was destroying persistent data written by
the normal one.

Amends b9cf021b8e.

Change-Id: Ie2775881535c4d19174177f443a4606acc1576de
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2023-07-17 15:53:52 +02:00
parent 134eee611a
commit 433f8a3241
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -1350,7 +1350,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
{ {
m_buildSystem = new CMakeBuildSystem(this); m_buildSystem = new CMakeBuildSystem(this);
buildDir.setValueAcceptor( buildDirectoryAspect()->setValueAcceptor(
[](const QString &oldDir, const QString &newDir) -> std::optional<QString> { [](const QString &oldDir, const QString &newDir) -> std::optional<QString> {
if (oldDir.isEmpty()) if (oldDir.isEmpty())
return newDir; return newDir;

1
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
View File

@@ -79,7 +79,6 @@ public:
void setInitialCMakeArguments(const QStringList &args); void setInitialCMakeArguments(const QStringList &args);
void setCMakeBuildType(const QString &cmakeBuildType, bool quiet = false); void setCMakeBuildType(const QString &cmakeBuildType, bool quiet = false);
ProjectExplorer::BuildDirectoryAspect buildDir{this, this};
Internal::InitialCMakeArgumentsAspect initialCMakeArguments{this}; Internal::InitialCMakeArgumentsAspect initialCMakeArguments{this};
Utils::StringAspect additionalCMakeOptions{this}; Utils::StringAspect additionalCMakeOptions{this};
Utils::FilePathAspect sourceDirectory{this}; Utils::FilePathAspect sourceDirectory{this};