diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-03-15 17:48:36 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-04-05 10:43:36 +0000 |
| commit | baa09164ae14c58ec11a925a1f0fa57117e8ff1d (patch) | |
| tree | 3d3d64f3801050eee244e02f273e21a312bcb69b /src/lib/qtprofilesetup | |
| parent | 8884edef3ce886748a5fcc10f0c452b0a1a9a411 (diff) | |
Fix and rename the excludedAuxiliaryInputs property
This property did not only exclude auxiliary inputs, but all kinds of
inputs ("inputs", "auxiliaryInputs", "explicitlyDependsOn"), which
happens to be what we want, as it does not appear to make any sense to
exclude only tags from one of the relevant "input-like" properties.
But the behavior was inconsistent: When building the (product-local)
rule graph, the property was considered, but not when collecting
artifacts from other products during rule application. This is now
fixed.
[ChangeLog] The excludedAuxiliaryInputs property of the Rule item has
been renamed to excludedInputs. The old name is deprecated.
Change-Id: Id7eae3461a6e85f53b3d47750d296c3e47a18a95
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'src/lib/qtprofilesetup')
| -rw-r--r-- | src/lib/qtprofilesetup/templates/core.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/qtprofilesetup/templates/core.qbs b/src/lib/qtprofilesetup/templates/core.qbs index 968f3efa0..fddd5c0e5 100644 --- a/src/lib/qtprofilesetup/templates/core.qbs +++ b/src/lib/qtprofilesetup/templates/core.qbs @@ -257,7 +257,7 @@ Module { name: "QtCoreMocRule" inputs: ["objcpp", "cpp", "hpp"] auxiliaryInputs: ["qt_plugin_metadata"] - excludedAuxiliaryInputs: ["unmocable"] + excludedInputs: ["unmocable"] outputFileTags: ["hpp", "cpp", "moc_cpp", "unmocable"] outputArtifacts: { if (input.fileTags.contains("unmocable")) |