aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2014-07-31 16:10:34 +0200
committerJoerg Bornemann <joerg.bornemann@digia.com>2014-07-31 18:25:01 +0200
commitb07742b80d3d1727d60df9b68b07bb79c4caabf1 (patch)
tree827e643eb6166ca577b3d0583e37b3bc86b9f20a
parent26354c36d3e08b1e05525aeea733b3e04e029070 (diff)
set alwaysUpdated and properties for re-used Artifact objects
Otherwise we can end up with outdated values. Task-number: QBS-645 Change-Id: If953d9530f3211666e903b2615410ed9ba2ac0f0 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
-rw-r--r--src/lib/corelib/buildgraph/rulesapplicator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/corelib/buildgraph/rulesapplicator.cpp b/src/lib/corelib/buildgraph/rulesapplicator.cpp
index c31319b10..86599a136 100644
--- a/src/lib/corelib/buildgraph/rulesapplicator.cpp
+++ b/src/lib/corelib/buildgraph/rulesapplicator.cpp
@@ -332,8 +332,6 @@ Artifact *RulesApplicator::createOutputArtifact(const QString &filePath, const F
outputArtifact = new Artifact;
outputArtifact->artifactType = Artifact::Generated;
outputArtifact->setFilePath(outputPath);
- outputArtifact->alwaysUpdated = alwaysUpdated;
- outputArtifact->properties = m_product->moduleProperties;
insertArtifact(m_product, outputArtifact, m_logger);
m_createdArtifacts += outputArtifact;
}
@@ -341,6 +339,8 @@ Artifact *RulesApplicator::createOutputArtifact(const QString &filePath, const F
outputArtifact->setFileTags(
fileTags.isEmpty() ? m_product->fileTagsForFileName(outputArtifact->fileName())
: fileTags);
+ outputArtifact->alwaysUpdated = alwaysUpdated;
+ outputArtifact->properties = m_product->moduleProperties;
for (int i = 0; i < m_product->artifactProperties.count(); ++i) {
const ArtifactPropertiesConstPtr &props = m_product->artifactProperties.at(i);