diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2013-11-08 11:09:33 -0500 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2013-11-14 16:55:52 +0100 |
| commit | fd674959b2cf6b5d57e113d574d7f579a6ef3a49 (patch) | |
| tree | a747f0b0157f4d0f3621ea012d2a86fad2928b4f /tests | |
| parent | e2dd776c821e6216ba69429fb5d1af51619b6523 (diff) | |
| download | qbs-fd674959b2cf6b5d57e113d574d7f579a6ef3a49.tar.gz | |
Fix a number of problems with the NSIS module.
- Add support for building installers outside of Windows.
- Add missing qbs. qualifiers
- Fix compressor handling
Task-number: QBS-414
Change-Id: I1df290d5dd79cb2fea9ab27feefdde21a46c69d7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/manual/nsis/hello.nsi | 2 | ||||
| -rwxr-xr-x | tests/manual/nsis/hello.qbs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/manual/nsis/hello.nsi b/tests/manual/nsis/hello.nsi index bee6f20c8..70b73056a 100755 --- a/tests/manual/nsis/hello.nsi +++ b/tests/manual/nsis/hello.nsi @@ -1,3 +1,5 @@ +SetCompressor zlib + !ifdef Win64 Name "Qbs Hello - ${qbs.architecture} (64-bit)" !else diff --git a/tests/manual/nsis/hello.qbs b/tests/manual/nsis/hello.qbs index 36b9b2636..47465dcf4 100755 --- a/tests/manual/nsis/hello.qbs +++ b/tests/manual/nsis/hello.qbs @@ -5,5 +5,5 @@ NSISSetup { targetName: "qbs-hello-" + qbs.architecture files: ["hello.nsi", "hello.bat"] nsis.defines: ["batchFile=hello.bat"] - nsis.compression: "lzma-solid" + nsis.compressor: "lzma-solid" } |
