diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2017-06-08 14:17:46 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-06-09 12:16:46 +0000 |
commit | 3b92dff5cc8eb57dc1cfd13aa81c9be763d646ef (patch) | |
tree | 056c689054fdfa13f77bb41c038da247a3dbde9f /tests/auto/blackbox/testdata/disappeared-profile | |
parent | 7343f24c774af89e7ddf9cf24c3932c703b5937c (diff) |
Use stored profile contents when re-resolving implicitly
As per our policy to take as much data as possible from an existing
build graph. We can now do incremental builds on a project whose
original profile is no longer available. This will enable us to import
projects built on the command line into Qt Creator, for instance.
Change-Id: I0498628c0c6d9a2f049f4769152685d392640bcf
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/blackbox/testdata/disappeared-profile')
4 files changed, 48 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata/disappeared-profile/disappeared-profile.qbs b/tests/auto/blackbox/testdata/disappeared-profile/disappeared-profile.qbs new file mode 100644 index 000000000..659864b14 --- /dev/null +++ b/tests/auto/blackbox/testdata/disappeared-profile/disappeared-profile.qbs @@ -0,0 +1,14 @@ +import qbs + +Product { + type: ["out1", "out2"] + Depends { name: "m" } + Group { + files: ["in1.txt"] + fileTags: ["in1"] + } + Group { + files: ["in2.txt"] + fileTags: ["in2"] + } +} diff --git a/tests/auto/blackbox/testdata/disappeared-profile/in1.txt b/tests/auto/blackbox/testdata/disappeared-profile/in1.txt new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/auto/blackbox/testdata/disappeared-profile/in1.txt diff --git a/tests/auto/blackbox/testdata/disappeared-profile/in2.txt b/tests/auto/blackbox/testdata/disappeared-profile/in2.txt new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/auto/blackbox/testdata/disappeared-profile/in2.txt diff --git a/tests/auto/blackbox/testdata/disappeared-profile/modules-dir/modules/m/m.qbs b/tests/auto/blackbox/testdata/disappeared-profile/modules-dir/modules/m/m.qbs new file mode 100644 index 000000000..a9c898889 --- /dev/null +++ b/tests/auto/blackbox/testdata/disappeared-profile/modules-dir/modules/m/m.qbs @@ -0,0 +1,34 @@ +import qbs + +Module { + property string p1 + property string p2 + + Rule { + inputs: ["in1"] + Artifact { + filePath: "dummy1.txt" + fileTags: ["out1"] + } + prepare: { + var cmd = new JavaScriptCommand(); + cmd.description = "Creating " + output.fileName + " with " + product.m.p1; + cmd.sourceCode = function() {}; + return [cmd]; + } + } + + Rule { + inputs: ["in2"] + Artifact { + filePath: "dummy2.txt" + fileTags: ["out2"] + } + prepare: { + var cmd = new JavaScriptCommand(); + cmd.description = "Creating " + output.fileName + " with " + product.m.p2; + cmd.sourceCode = function() {}; + return [cmd]; + } + } +} |