Merge 1.12 into master

Change-Id: Ieaf617a09ed16cf0c81ea7621d4d0ba23741fbfa

2 files changed, 31 insertions, 0 deletions

diff --git a/tests/auto/language/testdata/erroneous/original-in-export-item2.qbs b/tests/auto/language/testdata/erroneous/original-in-export-item2.qbs
new file mode 100644
index 000000000..d932d4aee
--- /dev/null
+++ b/tests/auto/language/testdata/erroneous/original-in-export-item2.qbs
@@ -0,0 +1,14 @@
+import qbs
+
+Project {
+    Product {
+        name: "a"
+        Export {
+            x.y.z: original
+        }
+    }
+    Product {
+        name: "b"
+        Depends { name: "a" }
+    }
+}
diff --git a/tests/auto/language/testdata/erroneous/original-in-export-item3.qbs b/tests/auto/language/testdata/erroneous/original-in-export-item3.qbs
new file mode 100644
index 000000000..d7bcb322e
--- /dev/null
+++ b/tests/auto/language/testdata/erroneous/original-in-export-item3.qbs
@@ -0,0 +1,17 @@
+import qbs
+
+Project {
+    Product {
+        name: "a"
+        Export {
+            Properties {
+                condition: true
+                x.y.z: original
+            }
+        }
+    }
+    Product {
+        name: "b"
+        Depends { name: "a" }
+    }
+}