diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-08-10 12:53:45 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-08-10 12:53:45 +0200 |
| commit | 0135957c349579d28256d05da342ea79b560bc77 (patch) | |
| tree | 994bf999196955596245bf3abe1eb4cba069aaaf /tests/auto/blackbox/testdata | |
| parent | 6464a075c5edfafb3a88bfc4097b3d5d9b9cdb28 (diff) | |
| parent | 349baf79883a96fdd85325a2900997fbf574f9a8 (diff) | |
Merge 1.12 into master
Change-Id: I20256cb4a06cab8d191e389f08d77ace82e4d6b9
Diffstat (limited to 'tests/auto/blackbox/testdata')
5 files changed, 45 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata/module-conditions/module-conditions.qbs b/tests/auto/blackbox/testdata/module-conditions/module-conditions.qbs new file mode 100644 index 000000000..dc3768203 --- /dev/null +++ b/tests/auto/blackbox/testdata/module-conditions/module-conditions.qbs @@ -0,0 +1,21 @@ +import qbs + +Project { + Product { + name: "p1" + qbs.architecture: "a" + Depends { name: "m" } + } + Product { + name: "p2" + qbs.architecture: "b" + Depends { name: "m" } + } + Product { + name: "p3" + multiplexByQbsProperties: "architectures" + aggregate: false + qbs.architectures: ["b", "c", "d"] + Depends { name: "m" } + } +} diff --git a/tests/auto/blackbox/testdata/module-conditions/modules/m/m1.qbs b/tests/auto/blackbox/testdata/module-conditions/modules/m/m1.qbs new file mode 100644 index 000000000..884350c3f --- /dev/null +++ b/tests/auto/blackbox/testdata/module-conditions/modules/m/m1.qbs @@ -0,0 +1,6 @@ +Module { + condition: qbs.architecture === "a" + validate: { + console.info("loaded m1"); + } +} diff --git a/tests/auto/blackbox/testdata/module-conditions/modules/m/m2.qbs b/tests/auto/blackbox/testdata/module-conditions/modules/m/m2.qbs new file mode 100644 index 000000000..bcec6f424 --- /dev/null +++ b/tests/auto/blackbox/testdata/module-conditions/modules/m/m2.qbs @@ -0,0 +1,6 @@ +Module { + condition: qbs.architecture === "b" + validate: { + console.info("loaded m2"); + } +} diff --git a/tests/auto/blackbox/testdata/module-conditions/modules/m/m3.qbs b/tests/auto/blackbox/testdata/module-conditions/modules/m/m3.qbs new file mode 100644 index 000000000..5453c617f --- /dev/null +++ b/tests/auto/blackbox/testdata/module-conditions/modules/m/m3.qbs @@ -0,0 +1,6 @@ +Module { + condition: qbs.architecture === "c" + validate: { + console.info("loaded m3"); + } +} diff --git a/tests/auto/blackbox/testdata/module-conditions/modules/m/m4.qbs b/tests/auto/blackbox/testdata/module-conditions/modules/m/m4.qbs new file mode 100644 index 000000000..a4cb0350d --- /dev/null +++ b/tests/auto/blackbox/testdata/module-conditions/modules/m/m4.qbs @@ -0,0 +1,6 @@ +Module { + condition: qbs.architecture === "d" + validate: { + console.info("loaded m4"); + } +} |