From 72f769c9ba1fd47de87f52724a61eaf1412b7b57 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 27 Apr 2017 11:45:06 +0200 Subject: [PATCH] Qbs: Make QbsNodeTreeBuilder handled uninitialized project Make QbsNodeTreeBuilder handle uninitialized projects more gracefully. Return a nullptr, so that the ContainerNode with the main project file is used in that case. Change-Id: I7ab90231c3fc24b7b676326f98f79c4b79018327 Reviewed-by: Christian Kandeler --- src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp b/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp index db80627f68f..bc4bd6504ee 100644 --- a/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp +++ b/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp @@ -192,6 +192,9 @@ namespace Internal { QbsRootProjectNode *QbsNodeTreeBuilder::buildTree(QbsProject *project) { + if (!project->qbsProjectData().isValid()) + return nullptr; + auto root = new QbsRootProjectNode(project); setupProjectNode(root, project->qbsProjectData(), project->qbsProject()); auto buildSystemFiles