Merge 1.12 into master

Change-Id: I0c914674c0728a7f7bc70fd9608914b95ef55a30

1 files changed, 42 insertions, 0 deletions

diff --git a/tests/auto/blackbox/testdata/changed-rule-inputs/changed-rule-inputs.qbs b/tests/auto/blackbox/testdata/changed-rule-inputs/changed-rule-inputs.qbs
new file mode 100644
index 000000000..8aef7b9b6
--- /dev/null
+++ b/tests/auto/blackbox/testdata/changed-rule-inputs/changed-rule-inputs.qbs
@@ -0,0 +1,42 @@
+import qbs
+
+Project {
+    Product {
+        name: "p1"
+        type: "p1"
+        Rule {
+            alwaysRun: true
+            multiplex: true
+            Artifact {
+                fileTags: "p1"
+                filePath: "p1-dummy"
+            }
+            prepare: {
+                var cmd = new JavaScriptCommand();
+                cmd.description = "generating " + output.fileName;
+                cmd.sourceCode = function() {};
+                return cmd;
+            }
+        }
+    }
+    Product {
+        name: "p2"
+        type: "p2"
+        Depends { name: "p1" }
+        Rule {
+            requiresInputs: false
+            multiplex: true
+            inputsFromDependencies: "p1"
+            Artifact {
+                fileTags: "p2"
+                filePath: "p2-dummy"
+            }
+            prepare: {
+                var cmd = new JavaScriptCommand();
+                cmd.description = "generating " + output.fileName;
+                cmd.sourceCode = function() {};
+                return cmd;
+            }
+        }
+    }
+}