diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-01-22 15:35:56 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-22 15:35:56 +0100 |
| commit | 1567610922907a7fc927a107d31fb6a383e7d4e1 (patch) | |
| tree | 068366ac68bc66e361dfae989601a402e455d1b1 /src/lib/corelib/buildgraph/executor.cpp | |
| parent | 58c04597bfbd244aa245630a56f7f29d5a8fafbb (diff) | |
| parent | fb5632e3930cbb5d93296d2df31ea0c369b3de41 (diff) | |
Merge "Merge remote-tracking branch 'origin/1.1'"
Diffstat (limited to 'src/lib/corelib/buildgraph/executor.cpp')
| -rw-r--r-- | src/lib/corelib/buildgraph/executor.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp index 76adbbc95..8e9334020 100644 --- a/src/lib/corelib/buildgraph/executor.cpp +++ b/src/lib/corelib/buildgraph/executor.cpp @@ -408,9 +408,10 @@ bool Executor::mustExecuteTransformer(const TransformerPtr &transformer) const { bool hasAlwaysUpdatedArtifacts = false; foreach (Artifact *artifact, transformer->outputs) { - if (!artifact->alwaysUpdated) + if (artifact->alwaysUpdated) + hasAlwaysUpdatedArtifacts = true; + else if (!m_buildOptions.forceTimestampCheck()) continue; - hasAlwaysUpdatedArtifacts = true; const bool upToDate = isUpToDate(artifact); // The invariant is that all output artifacts of a transformer have the same |