diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2015-01-21 22:32:34 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2015-01-22 16:47:58 +0100 |
| commit | d388fa417fc28cc1d8af30db17b40f99c453af5e (patch) | |
| tree | 05929ee72865b770ec9f1124bd16b6c51f83de60 /share/qbs/modules/bundle/BundleModule.qbs | |
| parent | e04b5268728421aabc34f033adefbba488e80b6b (diff) | |
Fix framework bundle construction and add an autotest to prove it.
Change-Id: I8c24a5a048fef9b7e0da1934d9be5a01893edbe4
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'share/qbs/modules/bundle/BundleModule.qbs')
| -rw-r--r-- | share/qbs/modules/bundle/BundleModule.qbs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs index 9ab48d153..7f0fb7c14 100644 --- a/share/qbs/modules/bundle/BundleModule.qbs +++ b/share/qbs/modules/bundle/BundleModule.qbs @@ -427,7 +427,7 @@ Module { cmd.description = "copying public headers"; cmd.highlight = "filegen"; cmd.sources = ModUtils.moduleProperties(product, "publicHeaders"); - cmd.destination = ModUtils.moduleProperty(product, "publicHeadersFolderPath"); + cmd.destination = FileInfo.joinPaths(product.destinationDirectory, ModUtils.moduleProperty(product, "publicHeadersFolderPath")); cmd.sourceCode = function() { var i; for (var i in sources) { @@ -441,7 +441,7 @@ Module { cmd.description = "copying private headers"; cmd.highlight = "filegen"; cmd.sources = ModUtils.moduleProperties(product, "privateHeaders"); - cmd.destination = ModUtils.moduleProperty(product, "privateHeadersFolderPath"); + cmd.destination = FileInfo.joinPaths(product.destinationDirectory, ModUtils.moduleProperty(product, "privateHeadersFolderPath")); cmd.sourceCode = function() { var i; for (var i in sources) { |