diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-16 14:40:09 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-16 14:40:09 +0100 |
| commit | f04bf5d3cc59ff859d5135fdb5048245ae99b91d (patch) | |
| tree | 45058972aa8c1f2736270d03bdb9d973fb5e7050 /src/lib/corelib/buildgraph/projectbuilddata.cpp | |
| parent | 3bc71587c924d849b5d5780ff7b4c6e02b390f99 (diff) | |
| parent | 1e142242fc462ebfa5c84339c8f2de2273712ece (diff) | |
Merge 1.11 into master
Change-Id: I9603ade37a1f839019c9219c940dcbb95c1cac89
Diffstat (limited to 'src/lib/corelib/buildgraph/projectbuilddata.cpp')
| -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 de1f96626..b382ed092 100644 --- a/src/lib/corelib/buildgraph/projectbuilddata.cpp +++ b/src/lib/corelib/buildgraph/projectbuilddata.cpp @@ -446,7 +446,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); } |