diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-11-17 17:49:54 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-11-17 17:50:08 +0100 |
| commit | ef4e2c97997e9ea32344841a17a830e937769cb3 (patch) | |
| tree | cf8e6f856c43647f55e9db1102b1378a93e0dc94 /src | |
| parent | 0e1f1c909ada3f1cc423b6e7f31ab1a50a22e5df (diff) | |
| parent | 0649b77b020b02436a843ee72a5941f2f875c846 (diff) | |
Merge 1.6 into 1.7
Change-Id: Ie25088c964f0d47ea8dde639667ebf85264615fe
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/corelib/buildgraph/executor.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp index 36e81ac56..946af9044 100644 --- a/src/lib/corelib/buildgraph/executor.cpp +++ b/src/lib/corelib/buildgraph/executor.cpp @@ -468,6 +468,8 @@ void Executor::executeRuleNode(RuleNode *ruleNode) for (const Artifact * const parent : artifact->parentArtifacts()) { if (parent->transformer->rule != ruleNode->rule()) continue; + if (!parent->alwaysUpdated) + continue; if (parent->timestamp() < artifact->timestamp()) { changedInputArtifacts += artifact; break; |