diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-11-01 17:43:37 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-11-08 10:11:56 +0000 |
| commit | d0516e847335e7f432f137bf4774a05b0c007569 (patch) | |
| tree | 6df238a585bca5f7fd827d8d2b3cd8e21f686ad0 /src/lib/corelib/buildgraph/executor.cpp | |
| parent | ebac3b42903486830e1fd8935981ff3a32e9de1a (diff) | |
Executor: Fix dynamic rules with generated inputsv1.6.1
This has never worked, as the condition that was supposed to collect
such inputs always evaluated to false.
Task-number: QBS-1029
Change-Id: Idf3f86f12fa050a3d151f4551821bf4395f715d8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/corelib/buildgraph/executor.cpp')
| -rw-r--r-- | src/lib/corelib/buildgraph/executor.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp index e0f023c3d..e774f71e7 100644 --- a/src/lib/corelib/buildgraph/executor.cpp +++ b/src/lib/corelib/buildgraph/executor.cpp @@ -449,9 +449,15 @@ void Executor::executeRuleNode(RuleNode *ruleNode) for (Artifact *artifact : filterByType<Artifact>(ruleNode->product->buildData->nodes)) { if (artifact->artifactType == Artifact::SourceFile) continue; - if (artifact->timestampRetrieved && !isUpToDate(artifact) - && ruleNode->rule()->acceptsAsInput(artifact)) { - changedInputArtifacts += artifact; + if (ruleNode->rule()->acceptsAsInput(artifact)) { + for (const Artifact * const parent : artifact->parentArtifacts()) { + if (parent->transformer->rule != ruleNode->rule()) + continue; + if (parent->timestamp() < artifact->timestamp()) { + changedInputArtifacts += artifact; + break; + } + } } } } |