Fix various bugs in WiX module and fix its autotest.

Misuse of moduleProperty vs moduleProperties, product vs input, reading
the toolchain property from the cpp module instead of the qbs module,
reading the build variant from the product instead of the qbs module,
and various style fixes.

Conditional artifacts are also replaced by outputArtifacts.

Change-Id: I11a7a73517cddb8f69db6270181f92c9674f9367
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

1 files changed, 8 insertions, 1 deletions

diff --git a/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs b/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs
index 88f50733d..aa93113dd 100644
--- a/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs
+++ b/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs
@@ -1,4 +1,5 @@
 import qbs
+import qbs.FileInfo
 
 Project {
     WindowsInstallerPackage {
@@ -6,6 +7,13 @@ Project {
         targetName: "qbs-" + qbs.architecture
         files: ["QbsSetup.wxs", "ExampleScript.bat"]
         wix.defines: ["scriptName=ExampleScript.bat"]
+
+        Export {
+            Depends { name: "wix" }
+            wix.defines: base.concat(["msiName=" +
+                FileInfo.joinPaths(product.buildDirectory,
+                    targetName + wix.windowsInstallerSuffix)])
+        }
     }
 
     WindowsSetupPackage {
@@ -13,7 +21,6 @@ Project {
         name: "QbsBootstrapper"
         targetName: "qbs-setup-" + qbs.architecture
         files: ["QbsBootstrapper.wxs"]
-        wix.defines: ["msiName=" + project.buildDirectory + "/QbsSetup/qbs-" + qbs.architecture + ".msi"]
     }
 
     WindowsInstallerPackage {