summaryrefslogtreecommitdiff
path: root/src/plugins/cmakeprojectmanager/builddirparameters.cpp
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2020-04-03 10:20:05 +0200
committerTobias Hunger <tobias.hunger@qt.io>2020-04-09 12:22:50 +0000
commit13daf11d03086ddb9047426bcab18ae0a24fe170 (patch)
treeeeb4b6314a5a52afb3efb454439c96b7a7313fbc /src/plugins/cmakeprojectmanager/builddirparameters.cpp
parent34f5e14afe1e34c2401cea1ab652908e665979e6 (diff)
downloadqt-creator-13daf11d03086ddb9047426bcab18ae0a24fe170.tar.gz
CMake: Simplify BuildDirParameters
Remove some useless bool, Creator would crash if that was ever set. Change-Id: I148cad6b6139332a6010698f075b584c87dec338 Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/builddirparameters.cpp')
-rw-r--r--src/plugins/cmakeprojectmanager/builddirparameters.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.cpp b/src/plugins/cmakeprojectmanager/builddirparameters.cpp
index 8c54186271..2d3e21502b 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
{