From cbe30a1cca6536aed14bafe14c25c8f239543a8e Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 10 Feb 2017 15:32:15 +0100 Subject: [PATCH] CMakeProjectManager: Add some soft asserts The actual problem is fixed by 1f540c6c9, this is to make sure we don't crash if this regresses again. Change-Id: Id081ce9a9c3602c3a90216f53d63535097fabd2d Reviewed-by: Tobias Hunger --- src/plugins/cmakeprojectmanager/servermodereader.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/cmakeprojectmanager/servermodereader.cpp b/src/plugins/cmakeprojectmanager/servermodereader.cpp index f1063c8d396..1ec9f63aca1 100644 --- a/src/plugins/cmakeprojectmanager/servermodereader.cpp +++ b/src/plugins/cmakeprojectmanager/servermodereader.cpp @@ -631,6 +631,7 @@ void ServerModeReader::addProjects(CMakeListsNode *root, for (const Project *p : projects) { CMakeProjectNode *pNode = findOrCreateProjectNode(root, p->sourceDirectory, p->name); QTC_ASSERT(pNode, continue); + QTC_ASSERT(root, continue); addTargets(root, p->targets, includeFiles); } } @@ -659,6 +660,7 @@ void ServerModeReader::addTargets(CMakeListsNode *root, { for (const Target *t : targets) { CMakeTargetNode *tNode = findOrCreateTargetNode(root, t->sourceDirectory, t->name); + QTC_ASSERT(tNode, qDebug() << "No target node for" << t->sourceDirectory << t->name; return); tNode->setTargetInformation(t->artifacts, t->type); addFileGroups(tNode, t->sourceDirectory, t->buildDirectory, t->fileGroups, headers); }