diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2015-07-29 12:29:35 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2015-07-30 08:44:24 +0000 |
| commit | 4b20594bd141fbfb46891ee100696a39ffe5d4c6 (patch) | |
| tree | 797387853453ed8afac79a0e1c64f444e418cf31 | |
| parent | 9373881c3883642e219568c9b3f270085f857407 (diff) | |
| download | qbs-4b20594bd141fbfb46891ee100696a39ffe5d4c6.tar.gz | |
Fix default values of wix module properties.
Task-number: QBS-832
Change-Id: I7b2df4ba78ac3b8417b2e0338b909641915fabf2
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| -rw-r--r-- | share/qbs/modules/wix/WiXModule.qbs | 6 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/wix/WiXInstallers.qbs | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/share/qbs/modules/wix/WiXModule.qbs b/share/qbs/modules/wix/WiXModule.qbs index e972df66e..e48af0a2e 100644 --- a/share/qbs/modules/wix/WiXModule.qbs +++ b/share/qbs/modules/wix/WiXModule.qbs @@ -107,13 +107,13 @@ Module { description: "the list of localizations to build the MSI for; leave undefined to build all localizations" } - property stringList extensions: type.contains("wixsetup") ? ["WixBalExtension"] : [] // default to WiX Standard Bootstrapper extension + property stringList extensions: product.type.contains("wixsetup") ? ["WixBalExtension"] : [] // default to WiX Standard Bootstrapper extension // private properties property string targetSuffix: { - if (type.contains("msi")) { + if (product.type.contains("msi")) { return windowsInstallerSuffix; - } else if (type.contains("wixsetup")) { + } else if (product.type.contains("wixsetup")) { return executableSuffix; } } diff --git a/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs b/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs index 0084df1c0..3e7facd7d 100644 --- a/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs +++ b/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs @@ -7,6 +7,7 @@ Project { targetName: "qbs-" + qbs.architecture files: ["QbsSetup.wxs", "ExampleScript.bat"] wix.defines: ["scriptName=ExampleScript.bat"] + wix.extensions: ["WixBalExtension", "WixUIExtension"] Export { Depends { name: "wix" } |