diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2018-08-31 16:18:07 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-08-31 16:18:07 +0200 |
commit | 58219e2d386a799cb89bf54a22386737614d31b0 (patch) | |
tree | 9e57e3e02d530e16cc512c95f1bededb68fd39e3 /src/lib/corelib/buildgraph/inputartifactscanner.cpp | |
parent | ac7351024345ef6730e9d3b575979be20991ff88 (diff) | |
parent | 89689cac88ffe880942c7acb59fc3374a34cbd6c (diff) |
Merge 1.12 into master
Change-Id: I745a07a3b25abd6c89afcd3b2199119a751e8a0c
Diffstat (limited to 'src/lib/corelib/buildgraph/inputartifactscanner.cpp')
-rw-r--r-- | src/lib/corelib/buildgraph/inputartifactscanner.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/corelib/buildgraph/inputartifactscanner.cpp b/src/lib/corelib/buildgraph/inputartifactscanner.cpp index 051560aba..143c99fb5 100644 --- a/src/lib/corelib/buildgraph/inputartifactscanner.cpp +++ b/src/lib/corelib/buildgraph/inputartifactscanner.cpp @@ -343,8 +343,8 @@ void InputArtifactScanner::handleDependency(ResolvedDependency &dependency) } else { if (m_artifact->children.contains(artifactDependency)) return; - safeConnect(m_artifact, artifactDependency); - m_artifact->childrenAddedByScanner += artifactDependency; + if (safeConnect(m_artifact, artifactDependency)) + m_artifact->childrenAddedByScanner += artifactDependency; m_newDependencyAdded = true; } } |