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

CMake: Fix crashes when last target is removed from a project

Browse Source 
Task-number: QTCREATORBUG-19112
Change-Id: I17893c3e15e9cabc09bf5ebb6746a5d76d9cc0bd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2017-10-17 15:41:52 +02:00
parent 87cd4495a9
commit 0a5f32ff75
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -140,6 +140,9 @@ CMakeProject::CMakeProject(const FileName &fileName) : Project(Constants::CMAKEM
connect(this, &Project::activeTargetChanged, this, [this]() { connect(this, &Project::activeTargetChanged, this, [this]() {
CMakeBuildConfiguration *bc = activeBc(this); CMakeBuildConfiguration *bc = activeBc(this);
if (!bc)
return;
// Target has switched, so the kit has changed, too. // Target has switched, so the kit has changed, too.
// * run cmake with configuration arguments if the reader needs to be switched // * run cmake with configuration arguments if the reader needs to be switched
// * run cmake without configuration arguments if the reader stays // * run cmake without configuration arguments if the reader stays
@@ -153,6 +156,9 @@ CMakeProject::CMakeProject(const FileName &fileName) : Project(Constants::CMAKEM
subscribeSignal(&Target::activeBuildConfigurationChanged, this, [this]() { subscribeSignal(&Target::activeBuildConfigurationChanged, this, [this]() {
CMakeBuildConfiguration *bc = activeBc(this); CMakeBuildConfiguration *bc = activeBc(this);
if (!bc)
return;
// Build configuration has switched: // Build configuration has switched:
// * Error out if the reader updates, can not happen since all BCs share a target/kit. // * Error out if the reader updates, can not happen since all BCs share a target/kit.
// * run cmake without configuration arguments if the reader stays // * run cmake without configuration arguments if the reader stays