diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-10-18 15:20:14 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-10-19 08:04:41 +0000 |
| commit | 8707c7bb1b95d93982ea3d20ad6af2a8f22a4d5a (patch) | |
| tree | 9713ab2add9aa80bc702d7db0a3cd716036a3a63 | |
| parent | 4470c1a5a416bc3ddc2878a6c0243e3c397b9a5a (diff) | |
| download | qt-creator-8707c7bb1b95d93982ea3d20ad6af2a8f22a4d5a.tar.gz | |
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 <jake.petroules@qt.io>
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsnodes.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsnodes.cpp b/src/plugins/qbsprojectmanager/qbsnodes.cpp index 58dd0d23af..28612849c0 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); |