diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-10-10 18:03:21 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-10-10 18:03:21 +0200 |
| commit | f6d6fa5f0d9ae74ec146d702b054d610bbde1101 (patch) | |
| tree | 42f376ab8457fbffda8020eeb15d95352077afcc /tests/auto/api/testdata/disabled-product | |
| parent | 55674b37aa0f574cc53454743e83cdbfed4e9941 (diff) | |
| parent | 8f79bb3b8cc9cde18b6c7f1843494cc23fa524e5 (diff) | |
Merge remote-tracking branch 'origin/1.3'
Conflicts:
share/qbs/modules/cpp/GenericGCC.qbs
src/app/qbs-setup-toolchains/probe.cpp
src/lib/corelib/buildgraph/buildgraph.cpp
src/lib/corelib/language/language.cpp
src/lib/corelib/language/language.h
tests/auto/api/tst_api.cpp
tests/auto/blackbox/tst_blackbox.cpp
tests/auto/blackbox/tst_blackbox.h
Change-Id: Ie337cd6b55ec1de4f906cb8311959eeb7bc6d686
Diffstat (limited to 'tests/auto/api/testdata/disabled-product')
| -rw-r--r-- | tests/auto/api/testdata/disabled-product/disabledProduct.qbs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/api/testdata/disabled-product/disabledProduct.qbs b/tests/auto/api/testdata/disabled-product/disabledProduct.qbs index 0c44995c7..c57615c10 100644 --- a/tests/auto/api/testdata/disabled-product/disabledProduct.qbs +++ b/tests/auto/api/testdata/disabled-product/disabledProduct.qbs @@ -3,4 +3,8 @@ import qbs CppApplication { condition: false files: "main.cpp" + Group { + condition: qbs.targetOS.contains("stuff") + qbs.install: false + } } |