aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2017-08-28 09:39:33 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2017-08-28 07:46:44 +0000
commitd1a13672b4c73263fd4e934a6bbd31afbd1373bc (patch)
tree468952e0b5aa8083294cce40e2b9fd65ef5a7d53 /share
parent7ed3fd38aa21cb09fb270402ee3cdd99484cddf0 (diff)
mingw: Fix manifest rule
The "inputs" parameter is not an array. Change-Id: I30355eb5e6fad7749a28d15453196f05add8dd17 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'share')
-rw-r--r--share/qbs/modules/cpp/windows-mingw.qbs6
1 files changed, 4 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/windows-mingw.qbs b/share/qbs/modules/cpp/windows-mingw.qbs
index f76fb424e..a7c468b6b 100644
--- a/share/qbs/modules/cpp/windows-mingw.qbs
+++ b/share/qbs/modules/cpp/windows-mingw.qbs
@@ -85,15 +85,17 @@ GenericGCC {
}
prepare: {
+ var inputList = inputs["native.pe.manifest"];
// TODO: Emulate manifest merging like Microsoft's mt.exe tool does
- if (inputs.length !== 1)
+ if (inputList.length !== 1) {
throw("The MinGW toolchain does not support manifest merging; " +
"you may only specify a single manifest file to embed into your assembly.");
+ }
var cmd = new JavaScriptCommand();
cmd.silent = true;
cmd.productType = product.type;
- cmd.inputFilePath = inputs[0].filePath;
+ cmd.inputFilePath = inputList[0].filePath;
cmd.outputFilePath = output.filePath;
cmd.sourceCode = function() {
var tf;