diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-08 19:04:38 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-08 19:05:16 +0200 |
| commit | c14e9d3d56a5fe5820077fde28289e6f2f484026 (patch) | |
| tree | fa4fdafe6ee9e372a6a79a1bc2cd96384f93c0ac /tests/auto/blackbox/testdata | |
| parent | 9a1f3ab94c64c24a0b4954f4e50bccdb7ba314fc (diff) | |
| parent | d203f9b8203dedd08e3588af0c64e1d16e130bf8 (diff) | |
Merge remote-tracking branch 'origin/1.2'
Change-Id: I4a1b580c51119b1a740e86a289d867e6f3102a39
Diffstat (limited to 'tests/auto/blackbox/testdata')
| -rw-r--r-- | tests/auto/blackbox/testdata/disable-product/project.qbs | 5 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/exportSimple/project.qbs | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata/disable-product/project.qbs b/tests/auto/blackbox/testdata/disable-product/project.qbs new file mode 100644 index 000000000..3aa7afd50 --- /dev/null +++ b/tests/auto/blackbox/testdata/disable-product/project.qbs @@ -0,0 +1,5 @@ +import qbs + +Product { + // condition: false +} diff --git a/tests/auto/blackbox/testdata/exportSimple/project.qbs b/tests/auto/blackbox/testdata/exportSimple/project.qbs index 1b665b880..96244671a 100644 --- a/tests/auto/blackbox/testdata/exportSimple/project.qbs +++ b/tests/auto/blackbox/testdata/exportSimple/project.qbs @@ -19,6 +19,10 @@ Project { } Export { Depends { name: 'dummy2' } + Properties { // QBS-550 + condition: false + qbs.optimization: "ludicrous speed" + } } } |