diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.cpp b/src/plugins/cmakeprojectmanager/builddirparameters.cpp index 8c54186271b..2d3e21502b1 100644 --- a/src/plugins/cmakeprojectmanager/builddirparameters.cpp +++ b/src/plugins/cmakeprojectmanager/builddirparameters.cpp @@ -47,13 +47,15 @@ BuildDirParameters::BuildDirParameters() = default; BuildDirParameters::BuildDirParameters(CMakeBuildConfiguration *bc) { - initialized = bc != nullptr; + QTC_ASSERT(bc, return ); - const Kit *k = bc->target()->kit(); + const Target *t = bc->target(); + const Kit *k = t->kit(); + const Project *p = t->project(); - projectName = bc->target()->project()->displayName(); + projectName = p->displayName(); - sourceDirectory = bc->target()->project()->projectDirectory(); + sourceDirectory = p->projectDirectory(); buildDirectory = bc->buildDirectory(); environment = bc->environment(); @@ -87,7 +89,10 @@ BuildDirParameters::BuildDirParameters(CMakeBuildConfiguration *bc) generatorArguments = CMakeGeneratorKitAspect::generatorArguments(k); } -bool BuildDirParameters::isValid() const { return initialized && cmakeTool(); } +bool BuildDirParameters::isValid() const +{ + return cmakeTool(); +} CMakeTool *BuildDirParameters::cmakeTool() const { diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.h b/src/plugins/cmakeprojectmanager/builddirparameters.h index 159ab902a88..7318ef03d86 100644 --- a/src/plugins/cmakeprojectmanager/builddirparameters.h +++ b/src/plugins/cmakeprojectmanager/builddirparameters.h @@ -49,7 +49,6 @@ public: bool isValid() const; CMakeTool *cmakeTool() const; - bool initialized = false; QString projectName; Utils::FilePath sourceDirectory;