Merge remote-tracking branch 'origin/1.1'

Change-Id: I7319a1deea008c9f4df077eaecf3147872fc4a21

1 files changed, 18 insertions, 13 deletions

diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp
index c1f7c6af3..fe546c97b 100644
--- a/src/lib/corelib/buildgraph/executor.cpp
+++ b/src/lib/corelib/buildgraph/executor.cpp
@@ -281,13 +281,8 @@ void Executor::doBuild()
     // find the root nodes
     m_roots.clear();
     foreach (const ResolvedProductPtr &product, m_productsToBuild) {
-        foreach (Artifact *targetArtifact, product->buildData->targetArtifacts) {
+        foreach (Artifact *targetArtifact, product->buildData->targetArtifacts)
             m_roots += targetArtifact;
-
-            // The user expects that he can delete target artifacts and they get rebuilt.
-            // To achieve this we must retrieve their timestamps.
-            targetArtifact->setTimestamp(FileInfo(targetArtifact->filePath()).lastModified());
-        }
     }
 
     prepareReachableArtifacts(initialBuildState);
@@ -412,14 +407,24 @@ bool Executor::isUpToDate(Artifact *artifact) const
 
 bool Executor::mustExecuteTransformer(const TransformerPtr &transformer) const
 {
-    foreach (Artifact *artifact, transformer->outputs)
-        if (artifact->alwaysUpdated)
-            return !isUpToDate(artifact);
+    bool hasAlwaysUpdatedArtifacts = false;
+    foreach (Artifact *artifact, transformer->outputs) {
+        if (!artifact->alwaysUpdated)
+            continue;
+        hasAlwaysUpdatedArtifacts = true;
+        const bool upToDate = isUpToDate(artifact);
 
-    // All outputs of the transformer have alwaysUpdated == false.
-    // We need at least on output that is always updated.
-    QBS_CHECK(false);
-    return true;
+        // The invariant is that all output artifacts of a transformer have the same
+        // "virtual" timestamp. However, if the user requested that on-disk timestamps be evaluated,
+        // they can differ and the oldest output file of the transformer decides.
+        if (!upToDate || !m_buildOptions.forceTimestampCheck())
+            return !upToDate;
+    }
+
+    // We need at least one output that is always updated.
+    QBS_CHECK(hasAlwaysUpdatedArtifacts);
+
+    return false;
 }
 
 void Executor::buildArtifact(Artifact *artifact)