aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-06-20 11:27:16 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2018-06-20 10:51:59 +0000
commit9d859d78bdf4b07ac78782ddcd1905ebf5e49605 (patch)
tree689c8fc6285e966aaaaae95e99c389ec6c6e03f6
parent4764e3eb961013e169c155648f26b0e63eb2b574 (diff)
Consider Transformer::explicitlyDependsOn when disconnecting artifacts
This was forgotten in d0e8197bbf. As a result, transformers could hold references to invalid artifacts, resulting in a crash when storing the build graph. Change-Id: I6af0d15d0c0ad44f1f9011c88e413f327a05943d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--src/lib/corelib/buildgraph/projectbuilddata.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/corelib/buildgraph/projectbuilddata.cpp b/src/lib/corelib/buildgraph/projectbuilddata.cpp
index 67228d35d..87e79c7b9 100644
--- a/src/lib/corelib/buildgraph/projectbuilddata.cpp
+++ b/src/lib/corelib/buildgraph/projectbuilddata.cpp
@@ -171,6 +171,7 @@ static void disconnectArtifactParents(Artifact *artifact)
QBS_CHECK(parentArtifact->transformer);
parentArtifact->childrenAddedByScanner.remove(artifact);
parentArtifact->transformer->inputs.remove(artifact);
+ parentArtifact->transformer->explicitlyDependsOn.remove(artifact);
parentArtifact->product->registerArtifactWithChangedInputs(parentArtifact);
}