From 8707c7bb1b95d93982ea3d20ad6af2a8f22a4d5a Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 18 Oct 2016 15:20:14 +0200 Subject: [PATCH] QbsProjectManager: Do not set up generated files for disabled products Such products are not guaranteed to have a valid build directory. Change-Id: I3e6ec211edb8fb9a13e3b785cd19b795f7adee12 Reviewed-by: Jake Petroules --- src/plugins/qbsprojectmanager/qbsnodes.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsnodes.cpp b/src/plugins/qbsprojectmanager/qbsnodes.cpp index 58dd0d23af2..28612849c0f 100644 --- a/src/plugins/qbsprojectmanager/qbsnodes.cpp +++ b/src/plugins/qbsprojectmanager/qbsnodes.cpp @@ -710,10 +710,12 @@ void QbsProductNode::setQbsProductData(const qbs::Project &project, const qbs::P } } - const QStringList generatedFiles - = Utils::transform(prd.generatedArtifacts(), &qbs::ArtifactData::filePath); - QbsGroupNode::setupFiles(m_generatedFilesNode, qbs::GroupData(), generatedFiles, - prd.buildDirectory(), true, true); + if (prd.isEnabled()) { + const QStringList generatedFiles + = Utils::transform(prd.generatedArtifacts(), &qbs::ArtifactData::filePath); + QbsGroupNode::setupFiles(m_generatedFilesNode, qbs::GroupData(), generatedFiles, + prd.buildDirectory(), true, true); + } addProjectNodes(toAdd); removeProjectNodes(toRemove);