diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-07-23 15:22:15 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-07-23 15:53:28 +0200 |
| commit | 327ad082299011c57145d0d6a5bc3bf70fdeeda9 (patch) | |
| tree | d545443a4d86e44d063f568dc733bdf8f1f2ee78 | |
| parent | 562018efc6cb5d7fab1290da0e5c5169b71524f2 (diff) | |
| download | qbs-327ad082299011c57145d0d6a5bc3bf70fdeeda9.tar.gz | |
fix tst_language dummy module
Disable dummy_base.
Remove includePaths that's supposed to be inherited.
Change-Id: I1245e386b8bd7d25786cf4786bfa3adb57b0ea65
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| -rw-r--r-- | src/lib/language/testdata/modules/dummy/dummy.qbs | 2 | ||||
| -rw-r--r-- | src/lib/language/testdata/modules/dummy/dummy_base.qbs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/language/testdata/modules/dummy/dummy.qbs b/src/lib/language/testdata/modules/dummy/dummy.qbs index 031d6425f..9484a70b8 100644 --- a/src/lib/language/testdata/modules/dummy/dummy.qbs +++ b/src/lib/language/testdata/modules/dummy/dummy.qbs @@ -1,8 +1,8 @@ import "dummy_base.qbs" as DummyBase DummyBase { + condition: true property stringList defines - property pathList includePaths property stringList cFlags property stringList cxxFlags } diff --git a/src/lib/language/testdata/modules/dummy/dummy_base.qbs b/src/lib/language/testdata/modules/dummy/dummy_base.qbs index 46ce3c0f8..0ecd8a1d8 100644 --- a/src/lib/language/testdata/modules/dummy/dummy_base.qbs +++ b/src/lib/language/testdata/modules/dummy/dummy_base.qbs @@ -1,3 +1,4 @@ Module { + condition: false property pathList includePaths } |