Merge 1.12 into master

Change-Id: I616949b321c26699ada0f2ae81b20a88db40b610

2 files changed, 8 insertions, 2 deletions

diff --git a/tests/auto/blackbox/testdata/no-such-profile/no-such-profile.qbs b/tests/auto/blackbox/testdata/no-such-profile/no-such-profile.qbs
new file mode 100644
index 000000000..8e64ba478
--- /dev/null
+++ b/tests/auto/blackbox/testdata/no-such-profile/no-such-profile.qbs
@@ -0,0 +1,6 @@
+import qbs
+
+Product {
+    name: "theProduct"
+    property int p
+}
diff --git a/tests/auto/blackbox/testdata/plugin-dependency/plugin-dependency.qbs b/tests/auto/blackbox/testdata/plugin-dependency/plugin-dependency.qbs
index e89371528..c619b33ef 100644
--- a/tests/auto/blackbox/testdata/plugin-dependency/plugin-dependency.qbs
+++ b/tests/auto/blackbox/testdata/plugin-dependency/plugin-dependency.qbs
@@ -26,7 +26,7 @@ Project {
         Depends { name: "cpp" }
         Export {
             Parameters {
-                cpp.link: false
+                cpp.link: false // marker 1
             }
         }
     }
@@ -55,7 +55,7 @@ Project {
         name: "helper1"
         files: ["helper1.cpp"]
         Depends { name: "cpp" }
-        Depends { name: "helper2"; cpp.link: false }
+        Depends { name: "helper2"; cpp.link: false /* marker 2 */ }
         Export {
             Depends { name: "cpp" }
             Depends { name: "helper2"; cpp.link: false }