aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2014-07-31 16:07:08 +0200
committerJoerg Bornemann <joerg.bornemann@digia.com>2014-07-31 18:12:27 +0200
commit26354c36d3e08b1e05525aeea733b3e04e029070 (patch)
tree17f9cb877dc2ffa59e7bb13a27ab5f8c4f980477
parente769ba6127e46a51ea8448e184920ae81f6c4837 (diff)
do not add file tags to re-used output artifacts
This was needed when we createOutputArtifact was called multiple times for the same file path. This doesn't happen anymore. Task-number: QBS-645 Change-Id: Ia99975ee64a183fa5718a2dd56ff4ce1bb11f2ed Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
-rw-r--r--src/lib/corelib/buildgraph/rulesapplicator.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/corelib/buildgraph/rulesapplicator.cpp b/src/lib/corelib/buildgraph/rulesapplicator.cpp
index f269636c3..c31319b10 100644
--- a/src/lib/corelib/buildgraph/rulesapplicator.cpp
+++ b/src/lib/corelib/buildgraph/rulesapplicator.cpp
@@ -327,23 +327,20 @@ Artifact *RulesApplicator::createOutputArtifact(const QString &filePath, const F
m_transformer = outputArtifact->transformer;
m_transformer->inputs.unite(inputArtifacts);
}
- FileTags tags = fileTags;
- tags += outputArtifact->fileTags();
- outputArtifact->setFileTags(tags);
outputArtifact->clearTimestamp();
} else {
outputArtifact = new Artifact;
outputArtifact->artifactType = Artifact::Generated;
outputArtifact->setFilePath(outputPath);
- outputArtifact->setFileTags(fileTags);
outputArtifact->alwaysUpdated = alwaysUpdated;
outputArtifact->properties = m_product->moduleProperties;
insertArtifact(m_product, outputArtifact, m_logger);
m_createdArtifacts += outputArtifact;
}
- if (outputArtifact->fileTags().isEmpty())
- outputArtifact->setFileTags(m_product->fileTagsForFileName(outputArtifact->fileName()));
+ outputArtifact->setFileTags(
+ fileTags.isEmpty() ? m_product->fileTagsForFileName(outputArtifact->fileName())
+ : fileTags);
for (int i = 0; i < m_product->artifactProperties.count(); ++i) {
const ArtifactPropertiesConstPtr &props = m_product->artifactProperties.at(i);