diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-21 17:38:06 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-22 08:34:01 +0000 |
| commit | e3ef6758205349a5be04e2d7b13507c617ec32fe (patch) | |
| tree | ea0a3fae20437497cd58e1b56b3f0f9bffb736ab /share | |
| parent | e86aea00dbf4c0c2deb127aa93276607e7a51909 (diff) | |
Remove "qbs" from some rule input tags
This hack hails from the days where rules required inputs and is no
longer needed.
Change-Id: I683f94c1e317784e3e9dc3bd7589459a0ba91f9f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/imports/qbs/base/AppleApplicationDiskImage.qbs | 1 | ||||
| -rw-r--r-- | share/qbs/modules/bundle/BundleModule.qbs | 3 | ||||
| -rw-r--r-- | share/qbs/modules/dmg/DMGModule.qbs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/share/qbs/imports/qbs/base/AppleApplicationDiskImage.qbs b/share/qbs/imports/qbs/base/AppleApplicationDiskImage.qbs index d1d4988c6..134f4dee0 100644 --- a/share/qbs/imports/qbs/base/AppleApplicationDiskImage.qbs +++ b/share/qbs/imports/qbs/base/AppleApplicationDiskImage.qbs @@ -41,7 +41,6 @@ AppleDiskImage { Rule { multiplex: true - inputs: ["qbs"] outputFileTags: ["dmg.input", "dmg.input.symlink"] outputArtifacts: Array.prototype.map.call(product.symlinks, function (symlink) { var symlinkTarget = symlink.split(':')[0]; diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs index e74fd7271..85a1a7388 100644 --- a/share/qbs/modules/bundle/BundleModule.qbs +++ b/share/qbs/modules/bundle/BundleModule.qbs @@ -263,7 +263,8 @@ Module { Rule { condition: qbs.targetOS.contains("darwin") multiplex: true - inputs: ["qbs", "infoplist", "partial_infoplist"] + requiresInputs: false // TODO: The resources property should probably be a tag instead. + inputs: ["infoplist", "partial_infoplist"] outputFileTags: ["bundle.input", "aggregate_infoplist"] outputArtifacts: { diff --git a/share/qbs/modules/dmg/DMGModule.qbs b/share/qbs/modules/dmg/DMGModule.qbs index 907c3e8f3..c5d097a0b 100644 --- a/share/qbs/modules/dmg/DMGModule.qbs +++ b/share/qbs/modules/dmg/DMGModule.qbs @@ -139,7 +139,7 @@ Module { Rule { multiplex: true - inputs: ["qbs", "dmg.input", "dmg.license", "icns", "tiff"] + inputs: ["dmg.input", "dmg.license", "icns", "tiff"] Artifact { fileTags: ["dmg.dmg"] |