aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-07-11 12:41:07 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2018-07-12 07:54:04 +0000
commit2440b19b288096e1601674de2ac15c560af469cd (patch)
tree6979f7c0e6e3a4f58fe382f7f81aab8b52c27a23
parentc8f372f851ced9c65996963cd164d8205e12a8dc (diff)
API: Consider auxiliary inputs when collecting transformer datav1.12.0
All auxiliary inputs are guaranteed to be present when a rule's commands run, so they must be added to TransformerData::inputs. Change-Id: I4c58f567ab603868aae180d931225edf7f9dcbf9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--src/lib/corelib/api/project.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp
index bad18cab9..5bbfb31c7 100644
--- a/src/lib/corelib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
@@ -806,6 +806,11 @@ ProjectTransformerData ProjectPrivate::transformerData()
tData.d->outputs << createArtifactData(a, product, targetArtifacts);
for (const Artifact * const child : filterByType<Artifact>(a->children))
allInputs << child;
+ for (Artifact * const a
+ : RulesApplicator::collectAuxiliaryInputs(t->rule.get(), product.get())) {
+ if (a->artifactType == Artifact::Generated)
+ tData.d->inputs << createArtifactData(a, product, targetArtifacts);
+ }
}
for (const Artifact * const input : allInputs)
tData.d->inputs << createArtifactData(input, product, targetArtifacts);