forked from qt-creator/qt-creator
CMake: Remove an accidentally introduces second build dir aspect
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:
@@ -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<QString> {
|
||||
if (oldDir.isEmpty())
|
||||
return newDir;
|
||||
|
@@ -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};
|
||||
|
Reference in New Issue
Block a user