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

CMake: Simplify BuildDirParameters

Browse Source 
Remove some useless bool, Creator would crash if that was ever set.

Change-Id: I148cad6b6139332a6010698f075b584c87dec338
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2020-04-03 10:20:05 +02:00
parent 34f5e14afe
commit 13daf11d03
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/cmakeprojectmanager/builddirparameters.cpp
View File

@@ -47,13 +47,15 @@ BuildDirParameters::BuildDirParameters() = default;
BuildDirParameters::BuildDirParameters(CMakeBuildConfiguration *bc) 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(); buildDirectory = bc->buildDirectory();
environment = bc->environment(); environment = bc->environment();
@@ -87,7 +89,10 @@ BuildDirParameters::BuildDirParameters(CMakeBuildConfiguration *bc)
generatorArguments = CMakeGeneratorKitAspect::generatorArguments(k); generatorArguments = CMakeGeneratorKitAspect::generatorArguments(k);
} }
bool BuildDirParameters::isValid() const { return initialized && cmakeTool(); } bool BuildDirParameters::isValid() const
{
return cmakeTool();
}
CMakeTool *BuildDirParameters::cmakeTool() const CMakeTool *BuildDirParameters::cmakeTool() const
{ {

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

@@ -49,7 +49,6 @@ public:
bool isValid() const; bool isValid() const;
CMakeTool *cmakeTool() const; CMakeTool *cmakeTool() const;
bool initialized = false;
QString projectName; QString projectName;
Utils::FilePath sourceDirectory; Utils::FilePath sourceDirectory;