summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2013-11-08 11:09:33 -0500
committerJake Petroules <jake.petroules@petroules.com>2013-11-14 16:55:52 +0100
commitfd674959b2cf6b5d57e113d574d7f579a6ef3a49 (patch)
treea747f0b0157f4d0f3621ea012d2a86fad2928b4f /tests
parente2dd776c821e6216ba69429fb5d1af51619b6523 (diff)
downloadqbs-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-xtests/manual/nsis/hello.nsi2
-rwxr-xr-xtests/manual/nsis/hello.qbs2
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"
}