diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2018-07-12 10:16:03 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-07-12 10:16:03 +0200 |
commit | c45cd4a943dfbbc9c54f65ec2ab5250e9b5ba1cb (patch) | |
tree | 88031e0928c9b4b0bf01d72a89c90f3e1406c593 /src/lib/corelib/buildgraph/rulenode.cpp | |
parent | adcadd2a06b906685bf0a2687dd5ab902f3b0ebf (diff) | |
parent | 2440b19b288096e1601674de2ac15c560af469cd (diff) |
Merge 1.12 into master
Change-Id: I056a96c062881c2a07ec15b1803efa9c9aa1a02a
Diffstat (limited to 'src/lib/corelib/buildgraph/rulenode.cpp')
-rw-r--r-- | src/lib/corelib/buildgraph/rulenode.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/corelib/buildgraph/rulenode.cpp b/src/lib/corelib/buildgraph/rulenode.cpp index 359054704..b3fc56031 100644 --- a/src/lib/corelib/buildgraph/rulenode.cpp +++ b/src/lib/corelib/buildgraph/rulenode.cpp @@ -217,6 +217,8 @@ ArtifactSet RuleNode::currentInputArtifacts() const // This can e.g. happen for the ["cpp", "hpp"] -> ["hpp", "cpp", "unmocable"] rule. continue; } + if (artifact->fileTags().intersects(m_rule->excludedInputs)) + continue; s += artifact; } } |