Fix scopes of dependency parameters

Only the values in Depends items of products had a scope, and that one
did not allow to access module instances.
Now the scope always is the surrounding item, which should be a sensible
one in all contexts.

Task-number: QBS-1253
Change-Id: Iedca2d98f82f71887373579f8e4dc91f057eded3
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

1 files changed, 11 insertions, 3 deletions

diff --git a/tests/auto/blackbox/testdata/plugin-dependency/plugin-dependency.qbs b/tests/auto/blackbox/testdata/plugin-dependency/plugin-dependency.qbs
index 97d602ced..a12aceccd 100644
--- a/tests/auto/blackbox/testdata/plugin-dependency/plugin-dependency.qbs
+++ b/tests/auto/blackbox/testdata/plugin-dependency/plugin-dependency.qbs
@@ -4,9 +4,16 @@ Project {
     CppApplication {
         name: "myapp"
         files: ["main.cpp"]
-        Depends { name: "plugin1"; cpp.link: false }    // not to be linked
+        Depends {
+            name: "plugin1"                             // not to be linked
+            cpp.link: qbs.hostOS === undefined
+        }
         Depends { name: "plugin2" }                     // not to be linked
-        Depends { name: "plugin3"; cpp.link: true }     // supposed to be linked
+        Depends {
+            name: "plugin3"                             // supposed to be linked
+            //property bool theCondition: true
+            cpp.link: /*theCondition && */product.name === "myapp"  // TODO: Make this work
+        }
         Depends { name: "plugin4" }                     // supposed to be linked
         Depends { name: "helper" }                      // supposed to be linked
     }
@@ -41,7 +48,8 @@ Project {
         Depends { name: "cpp" }
         Export {
             Parameters {
-                cpp.link: true
+                // property bool theCondition: true
+                cpp.link: true // theCondition TODO: Make this work
             }
         }
     }