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

QbsProjectManager: Do not set up generated files for disabled products

Browse Source 
Such products are not guaranteed to have a valid build directory.

Change-Id: I3e6ec211edb8fb9a13e3b785cd19b795f7adee12
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Christian Kandeler
2016-10-18 15:20:14 +02:00
parent 4470c1a5a4
commit 8707c7bb1b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qbsprojectmanager/qbsnodes.cpp
View File

@@ -710,10 +710,12 @@ void QbsProductNode::setQbsProductData(const qbs::Project &project, const qbs::P
} }
} }
const QStringList generatedFiles if (prd.isEnabled()) {
= Utils::transform(prd.generatedArtifacts(), &qbs::ArtifactData::filePath); const QStringList generatedFiles
QbsGroupNode::setupFiles(m_generatedFilesNode, qbs::GroupData(), generatedFiles, = Utils::transform(prd.generatedArtifacts(), &qbs::ArtifactData::filePath);
prd.buildDirectory(), true, true); QbsGroupNode::setupFiles(m_generatedFilesNode, qbs::GroupData(), generatedFiles,
prd.buildDirectory(), true, true);
}
addProjectNodes(toAdd); addProjectNodes(toAdd);
removeProjectNodes(toRemove); removeProjectNodes(toRemove);