diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-11-18 13:17:24 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-11-18 12:29:38 +0000 |
| commit | cab09574064cde834d074e27fb70ce048d779a49 (patch) | |
| tree | 631040235707578007ba1da4116ecd5f39f14526 | |
| parent | 16f2f56b1d770f1e851fc689bd400892c7133a12 (diff) | |
Handle some TODO items in test projects
Change-Id: I519c0d116b4fac2b49278886febbaa31ec6e3790
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
3 files changed, 3 insertions, 9 deletions
diff --git a/tests/auto/blackbox/testdata/missing-dependency/missing-dependency.qbs b/tests/auto/blackbox/testdata/missing-dependency/missing-dependency.qbs index e3a37d415..a30ac2a70 100644 --- a/tests/auto/blackbox/testdata/missing-dependency/missing-dependency.qbs +++ b/tests/auto/blackbox/testdata/missing-dependency/missing-dependency.qbs @@ -6,14 +6,8 @@ Project { name: "theDep" type: ["genheader"] - // TODO: Remove in 1.6 - Group { - files: ["theHeader.h.in"] - fileTags: ["header.in"] - } - Rule { - inputs: ["header.in"] + multiplex: true Artifact { filePath: project.buildDirectory + "/theHeader.h" fileTags: product.type diff --git a/tests/auto/blackbox/testdata/missing-dependency/theHeader.h.in b/tests/auto/blackbox/testdata/missing-dependency/theHeader.h.in deleted file mode 100644 index e69de29bb..000000000 --- a/tests/auto/blackbox/testdata/missing-dependency/theHeader.h.in +++ /dev/null diff --git a/tests/auto/blackbox/testdata/properties-in-export-items/properties-in-export-items.qbs b/tests/auto/blackbox/testdata/properties-in-export-items/properties-in-export-items.qbs index efd840907..a3baf07a0 100644 --- a/tests/auto/blackbox/testdata/properties-in-export-items/properties-in-export-items.qbs +++ b/tests/auto/blackbox/testdata/properties-in-export-items/properties-in-export-items.qbs @@ -6,7 +6,7 @@ Project { Product { name: "dep" Export { - property string theDefine + property string theDefine: "" Depends { name: "cpp" } cpp.defines: [theDefine] } @@ -24,8 +24,8 @@ Project { consoleApplication: true Depends { name: "dep" } Group { + dep.theDefine: "P2" files: ["main2.cpp"] } - dep.theDefine: "P2" // TODO: Move to Group when QBS-1005 is fixed. } } |