diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2014-04-09 22:27:36 +0400 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2014-04-11 01:37:16 +0200 |
| commit | 944ac35a55af62a1a372aa873470e3d6c73143f3 (patch) | |
| tree | 157261c19b7fb0be1ad2def9320102a328305ae3 | |
| parent | 7343f111666c0560737f4156982f17cac1e8814b (diff) | |
WiX: Fix the "cultures" property handling
Task-number: QBS-542
Change-Id: I4ec5bf6020732155ab1a20583861e4bbadd196d9
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| -rw-r--r-- | share/qbs/modules/wix/WiXModule.qbs | 3 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/wix/WiXInstallers.qbs | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/share/qbs/modules/wix/WiXModule.qbs b/share/qbs/modules/wix/WiXModule.qbs index 03ea3fb7c..02642b874 100644 --- a/share/qbs/modules/wix/WiXModule.qbs +++ b/share/qbs/modules/wix/WiXModule.qbs @@ -361,7 +361,8 @@ Module { if (product.type.contains("msi")) { var cultures = ModUtils.moduleProperty(product, "cultures"); - args.push("-cultures:" + (cultures ? cultures.join(";") : "null")); + args.push("-cultures:" + + (cultures && cultures.length > 0 ? cultures.join(";") : "null")); } // User-supplied flags diff --git a/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs b/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs index 17eafda82..718901675 100644 --- a/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs +++ b/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs @@ -20,5 +20,6 @@ Project { name: "RegressionBuster9000" files: ["QbsSetup.wxs", "Qt.wxs"] wix.defines: ["scriptName=ExampleScript.bat"] + wix.cultures: [] } } |