Merge branch '1.15' into master

Change-Id: I7e348db380b836221db79c73ea3b5f1d891f114b

1 files changed, 31 insertions, 20 deletions

diff --git a/tests/auto/blackbox/testdata/probeProperties/probeProperties.qbs b/tests/auto/blackbox/testdata/probeProperties/probeProperties.qbs
index 9846eacef..ce89d11f4 100644
--- a/tests/auto/blackbox/testdata/probeProperties/probeProperties.qbs
+++ b/tests/auto/blackbox/testdata/probeProperties/probeProperties.qbs
@@ -1,29 +1,40 @@
 import qbs.Probes
 
-CppApplication {
-    Probes.PathProbe {
-        id: probe1
-        names: ["bin/tool"]
-        platformSearchPaths: [product.sourceDirectory]
-    }
+Project {
 
-    Probes.PathProbe {
-        id: probe2
-        names: ["tool"]
-        platformSearchPaths: [product.sourceDirectory + "/bin"]
-    }
+    CppApplication {
+        Probes.PathProbe {
+            id: probe1
+            names: ["bin/tool"]
+            platformSearchPaths: [product.sourceDirectory]
+        }
 
-    targetName: {
-        console.info("probe1.fileName=" + probe1.fileName);
-        console.info("probe1.path=" + probe1.path);
-        console.info("probe1.filePath=" + probe1.filePath);
+        Probes.PathProbe {
+            id: probe2
+            names: ["tool"]
+            platformSearchPaths: [product.sourceDirectory + "/bin"]
+        }
 
-        console.info("probe2.fileName=" + probe2.fileName);
-        console.info("probe2.path=" + probe2.path);
-        console.info("probe2.filePath=" + probe2.filePath);
+        targetName: {
+            console.info("probe1.fileName=" + probe1.fileName);
+            console.info("probe1.path=" + probe1.path);
+            console.info("probe1.filePath=" + probe1.filePath);
 
-        return name;
+            console.info("probe2.fileName=" + probe2.fileName);
+            console.info("probe2.path=" + probe2.path);
+            console.info("probe2.filePath=" + probe2.filePath);
+
+            console.info("probe3.fileName=" + probe3.fileName);
+            console.info("probe3.path=" + probe3.path);
+            console.info("probe3.filePath=" + probe3.filePath);
+            return name;
+        }
+    }
+
+    Probes.PathProbe {
+        id: probe3
+        names: ["tool"]
+        platformSearchPaths: [project.sourceDirectory + "/bin"]
     }
 
-    files: ["main.c"]
 }