diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2015-07-11 21:27:22 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2015-07-13 10:45:03 +0000 |
| commit | f79c351bb70a159959cb211dae315ce1e209742b (patch) | |
| tree | cba69766b25244308e48ad423a1c5fcbc54a4856 /share/qbs/modules/wix | |
| parent | 1ea5f90d2d4a374efd9d0e79da4d686922becbc6 (diff) | |
Fix path issues in the wix module.
These tools expect backslashes as separators, and also make sure the
compiler and linker are relative to the install path, not env PATH.
Change-Id: I7c215e636ed59f5f091005e2d53cd04a2dcdb19c
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'share/qbs/modules/wix')
| -rw-r--r-- | share/qbs/modules/wix/WiXModule.qbs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/share/qbs/modules/wix/WiXModule.qbs b/share/qbs/modules/wix/WiXModule.qbs index a1183a0da..a93a0b771 100644 --- a/share/qbs/modules/wix/WiXModule.qbs +++ b/share/qbs/modules/wix/WiXModule.qbs @@ -46,9 +46,9 @@ Module { property int versionBuild: versionParts[3] property string compilerName: "candle.exe" - property string compilerPath: compilerName + property string compilerPath: FileInfo.joinPaths(toolchainInstallRoot, compilerName) property string linkerName: "light.exe" - property string linkerPath: linkerName + property string linkerPath: FileInfo.joinPaths(toolchainInstallRoot, linkerName) property string warningLevel: "normal" PropertyOptions { @@ -408,7 +408,7 @@ Module { for (i in inputs.wxl) { args.push("-loc"); - args.push(inputs.wxl[i].filePath); + args.push(FileInfo.toWindowsSeparators(inputs.wxl[i].filePath)); } if (product.type.contains("msi")) { @@ -424,7 +424,7 @@ Module { } for (i in inputs.wixobj) { - args.push(inputs.wixobj[i].filePath); + args.push(FileInfo.toWindowsSeparators(inputs.wixobj[i].filePath)); } var cmd = new Command(ModUtils.moduleProperty(product, "linkerPath"), args); |