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

CMake: Do not crash when deleting cmake tools

Browse Source 
Do not crash when the cmake tool that was used to parse the project
gets removed.

Change-Id: Ieda3ae2025dbcfb1f90d9bd01c5f0ed960756c6a
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Tobias Hunger
2018-05-24 16:57:31 +02:00
parent b48742ad40
commit 88b065db3f
8 changed files with 45 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
View File

@@ -83,13 +83,16 @@ Core::Id CMakeKitInformation::id()
return TOOL_ID;
}
CMakeTool *CMakeKitInformation::cmakeTool(const Kit *k)
Core::Id CMakeKitInformation::cmakeToolId(const Kit *k)
{
if (!k)
return nullptr;
return {};
return Core::Id::fromSetting(k->value(TOOL_ID));
}
const QVariant id = k->value(TOOL_ID);
return CMakeToolManager::findById(Core::Id::fromSetting(id));
CMakeTool *CMakeKitInformation::cmakeTool(const Kit *k)
{
return CMakeToolManager::findById(cmakeToolId(k));
}
void CMakeKitInformation::setCMakeTool(Kit *k, const Core::Id id)