diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2013-11-14 11:19:03 -0500 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2013-11-14 17:39:10 +0100 |
| commit | c6999051db342f723e89e462c14fa3755594d68e (patch) | |
| tree | 318615994585d875799d285b8973d22945bdedec | |
| parent | fd674959b2cf6b5d57e113d574d7f579a6ef3a49 (diff) | |
| download | qbs-c6999051db342f723e89e462c14fa3755594d68e.tar.gz | |
Fix the condition for the WiX and NSIS imports.
Change-Id: I458175a3462907a1b9b0d3bb83533207557c6517
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rwxr-xr-x | share/qbs/imports/qbs/base/NSISSetup.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/imports/qbs/base/WindowsInstallerPackage.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/imports/qbs/base/WindowsSetupPackage.qbs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/share/qbs/imports/qbs/base/NSISSetup.qbs b/share/qbs/imports/qbs/base/NSISSetup.qbs index a533aac3a..f52398a2a 100755 --- a/share/qbs/imports/qbs/base/NSISSetup.qbs +++ b/share/qbs/imports/qbs/base/NSISSetup.qbs @@ -1,4 +1,4 @@ Product { - Depends { name: "nsis" } + Depends { name: "nsis"; condition: qbs.targetOS.contains("windows") } type: ["nsissetup"] } diff --git a/share/qbs/imports/qbs/base/WindowsInstallerPackage.qbs b/share/qbs/imports/qbs/base/WindowsInstallerPackage.qbs index 27b3f68cc..d0b2d1770 100644 --- a/share/qbs/imports/qbs/base/WindowsInstallerPackage.qbs +++ b/share/qbs/imports/qbs/base/WindowsInstallerPackage.qbs @@ -1,4 +1,4 @@ Product { - Depends { name: "wix" } + Depends { name: "wix"; condition: qbs.hostOS.contains("windows") && qbs.targetOS.contains("windows") } type: ["msi"] } diff --git a/share/qbs/imports/qbs/base/WindowsSetupPackage.qbs b/share/qbs/imports/qbs/base/WindowsSetupPackage.qbs index a3609ed03..aa806c66e 100644 --- a/share/qbs/imports/qbs/base/WindowsSetupPackage.qbs +++ b/share/qbs/imports/qbs/base/WindowsSetupPackage.qbs @@ -1,4 +1,4 @@ Product { - Depends { name: "wix" } + Depends { name: "wix"; condition: qbs.hostOS.contains("windows") && qbs.targetOS.contains("windows") } type: ["wixsetup"] } |