Merge 1.12 into master

Change-Id: I0c914674c0728a7f7bc70fd9608914b95ef55a30

1 files changed, 23 insertions, 0 deletions

diff --git a/tests/auto/blackbox/testdata/import-assignment/import-assignment.qbs b/tests/auto/blackbox/testdata/import-assignment/import-assignment.qbs
new file mode 100644
index 000000000..2bff00f35
--- /dev/null
+++ b/tests/auto/blackbox/testdata/import-assignment/import-assignment.qbs
@@ -0,0 +1,23 @@
+import qbs
+import MyImport
+
+Product {
+    type: "outtype"
+    property var importValue: MyImport
+    Rule {
+        multiplex: true
+        Artifact {
+            fileTags: "outtype"
+            filePath: "dummy"
+        }
+        prepare: {
+            var cmd = new JavaScriptCommand;
+            cmd.silent = true;
+            cmd.sourceCode = function() {
+                console.info("key 1 = " + product.importValue.key1);
+                console.info("key 2 = " + product.importValue.key2);
+            };
+            return cmd;
+        }
+    }
+}