diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-04-27 17:47:51 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-05-09 12:55:51 +0000 |
| commit | 92d532d88d7962d4568554d3f2928fd3d1d259d7 (patch) | |
| tree | c2d73ef2162f7700765a40ba04e63e29c9dfb8f0 /tests/auto/api | |
| parent | fb371a811d5f8de4ed78dd7b7a625b30e3e25996 (diff) | |
Add new property explicitlyDependsOnFromDependencies
This change adds new Rule item property called
explicitlyDependsOnFromDependencies.
It allows specifying a list of file tags to consider in dependent
target artifacts which should be used as dependencies.
[ChangeLog] The Rule item property explicitlyDependsOn no longer
considers target artifacts of products that the processed product
depends on. The new property explicitlyDependsOnFromDependencies can
be used for that purpose.
Change-Id: I47a80699fe881d4075b292ad164dd6e776049a83
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/api')
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/api/testdata/excluded-inputs/excluded-inputs.qbs b/tests/auto/api/testdata/excluded-inputs/excluded-inputs.qbs index 37c4261f4..faa51d3b9 100644 --- a/tests/auto/api/testdata/excluded-inputs/excluded-inputs.qbs +++ b/tests/auto/api/testdata/excluded-inputs/excluded-inputs.qbs @@ -92,7 +92,7 @@ Project { } Rule { multiplex: true - explicitlyDependsOn: "the_tag" + explicitlyDependsOnFromDependencies: "the_tag" excludedAuxiliaryInputs: "the_other_tag" Artifact { filePath: "dummy3.txt" diff --git a/tests/auto/api/testdata/explicitly-depends-on/explicitly-depends-on.qbs b/tests/auto/api/testdata/explicitly-depends-on/explicitly-depends-on.qbs index 0ac4a7463..17aa74697 100644 --- a/tests/auto/api/testdata/explicitly-depends-on/explicitly-depends-on.qbs +++ b/tests/auto/api/testdata/explicitly-depends-on/explicitly-depends-on.qbs @@ -20,7 +20,7 @@ Project { Rule { inputs: ["mytype.in"] - explicitlyDependsOn: ["compiler"] + explicitlyDependsOnFromDependencies: ["compiler"] Artifact { filePath: input.fileName + ".out" fileTags: product.type @@ -36,7 +36,7 @@ Project { Rule { multiplex: true - explicitlyDependsOn: ["compiler"] + explicitlyDependsOnFromDependencies: ["compiler"] Artifact { filePath: "compiler-name.txt" fileTags: product.type diff --git a/tests/auto/api/testdata/tool-in-module/use-outside-project/modules/thetool/thetool.qbs b/tests/auto/api/testdata/tool-in-module/use-outside-project/modules/thetool/thetool.qbs index d9bd47003..9521f3ae4 100644 --- a/tests/auto/api/testdata/tool-in-module/use-outside-project/modules/thetool/thetool.qbs +++ b/tests/auto/api/testdata/tool-in-module/use-outside-project/modules/thetool/thetool.qbs @@ -13,7 +13,7 @@ Module { Rule { multiplex: true - explicitlyDependsOn: ["thetool.thetool"] + explicitlyDependsOnFromDependencies: ["thetool.thetool"] Artifact { filePath: "tool-output.txt" fileTags: ["thetool.output"] diff --git a/tests/auto/api/testdata/tool-in-module/use-within-project/use-within-project.qbs b/tests/auto/api/testdata/tool-in-module/use-within-project/use-within-project.qbs index 13b2bb819..bd480fb08 100644 --- a/tests/auto/api/testdata/tool-in-module/use-within-project/use-within-project.qbs +++ b/tests/auto/api/testdata/tool-in-module/use-within-project/use-within-project.qbs @@ -15,7 +15,7 @@ Project { Depends { name: "cpp" } Rule { multiplex: true - explicitlyDependsOn: ["thetool.thetool"] + explicitlyDependsOnFromDependencies: ["thetool.thetool"] Artifact { filePath: "tool-output.txt" fileTags: ["thetool.output"] |