From 0c0b004493a0509a33e48fe9eb25a439d9332994 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 21 Feb 2017 12:26:04 +0100 Subject: [PATCH] CppTools: Fix setting ProjectPart::project This was forgotten in commit 8c90998fff6ec3cf85ad87b56175e86b6f0a93d0 CppTools/ProjectManagers: Reduce ui blocking when loading projects Change-Id: I5c3a8a4015dd3b4389a21a80367a9eac7ebd95fd Reviewed-by: Christian Stenger --- src/plugins/cpptools/cppprojectinfogenerator.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/cpptools/cppprojectinfogenerator.cpp b/src/plugins/cpptools/cppprojectinfogenerator.cpp index 56216ccd4a6..e85faecf307 100644 --- a/src/plugins/cpptools/cppprojectinfogenerator.cpp +++ b/src/plugins/cpptools/cppprojectinfogenerator.cpp @@ -175,9 +175,11 @@ ProjectInfo ProjectInfoGenerator::generate() return m_projectInfo; } -static ProjectPart::Ptr projectPartFromRawProjectPart(const RawProjectPart &rawProjectPart) +static ProjectPart::Ptr projectPartFromRawProjectPart(const RawProjectPart &rawProjectPart, + ProjectExplorer::Project *project) { ProjectPart::Ptr part(new ProjectPart); + part->project = project; part->projectFile = rawProjectPart.projectFile; part->projectConfigFile = rawProjectPart.projectConfigFile; part->qtVersion = rawProjectPart.qtVersion; @@ -196,7 +198,8 @@ void ProjectInfoGenerator::createProjectParts(const RawProjectPart &rawProjectPa rawProjectPart.fileClassifier); if (cat.hasParts()) { - const ProjectPart::Ptr part = projectPartFromRawProjectPart(rawProjectPart); + const ProjectPart::Ptr part = projectPartFromRawProjectPart(rawProjectPart, + m_projectUpdateInfo.project); if (cat.hasCxxSources()) { createProjectPart(rawProjectPart,