Make Module.setup{Build,Run}Environment first-class citizens

They did not have the project and product variables available, and they
accessed module properties in a way that made it look as if they were
normal properties rather than scripts, which was misleading.
Now everything works the same as in Rule scripts and JS commands.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/share/qbs/modules/xcode/xcode.qbs b/share/qbs/modules/xcode/xcode.qbs
index 60f49fe71..0df7f5204 100644
--- a/share/qbs/modules/xcode/xcode.qbs
+++ b/share/qbs/modules/xcode/xcode.qbs
@@ -223,14 +223,14 @@ Module {
     }
 
     setupBuildEnvironment: {
-        var v = new ModUtils.EnvironmentVariable("PATH", qbs.pathListSeparator, false);
-        v.prepend(platformPath + "/Developer/usr/bin");
-        v.prepend(developerPath + "/usr/bin");
+        var v = new ModUtils.EnvironmentVariable("PATH", product.qbs.pathListSeparator, false);
+        v.prepend(product.xcode.platformPath + "/Developer/usr/bin");
+        v.prepend(product.xcode.developerPath + "/usr/bin");
         v.set();
 
-        for (var key in buildEnv) {
+        for (var key in product.xcode.buildEnv) {
             v = new ModUtils.EnvironmentVariable(key);
-            v.value = buildEnv[key];
+            v.value = product.xcode.buildEnv[key];
             v.set();
         }
     }