diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-14 14:14:20 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-15 09:24:24 +0000 |
| commit | 229a889342de306a51fb6c13787708085f631e03 (patch) | |
| tree | 6659af3c7a085ccc8f763803228bffa1c975356c /src | |
| parent | 63535355c257fb7d7283db0797068a5df451865b (diff) | |
Fix connection to rules of dependencies
... for the case that auxiliaryInputs or explicitlyDependsOn contains
"installable". They must be considered in addition to
inputsFromDependencies, because they also match target artifacts of
dependencies.
Change-Id: Ib960001a8e67034d6d1382bacc385bdcd9ddfb99
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/corelib/buildgraph/projectbuilddata.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/corelib/buildgraph/projectbuilddata.cpp b/src/lib/corelib/buildgraph/projectbuilddata.cpp index 22d03106e..0d0db4708 100644 --- a/src/lib/corelib/buildgraph/projectbuilddata.cpp +++ b/src/lib/corelib/buildgraph/projectbuilddata.cpp @@ -452,7 +452,9 @@ void BuildDataResolver::connectRulesToDependencies(const ResolvedProductPtr &pro for (RuleNode *ruleNode : ruleNodes) { static const FileTag installableTag("installable"); if (areRulesCompatible(ruleNode, depRuleNode) - || (ruleNode->rule()->inputsFromDependencies.contains(installableTag) + || ((ruleNode->rule()->inputsFromDependencies.contains(installableTag) + || ruleNode->rule()->auxiliaryInputs.contains(installableTag) + || ruleNode->rule()->explicitlyDependsOn.contains(installableTag)) && isRootRuleNode(depRuleNode))) { connect(ruleNode, depRuleNode); } |