diff options
| author | Петров Сергей <msgtome@bk.ru> | 2016-04-28 12:15:16 +0300 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-05-03 05:05:27 +0000 |
| commit | 1ff2053031b3fa5b1a04be7c8f11c5ddf5e52de4 (patch) | |
| tree | 6e61dfefaab280f8218c51c23d7670da11a9df50 | |
| parent | 38d8b1d84aeaed164b3bf7721cd6fce0015ddd2c (diff) | |
cli module: fix compilerFlags addition
Change-Id: I9397f3f18edeec23da38a8683b9d0aa8dae60bdc
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| -rwxr-xr-x | share/qbs/modules/cli/cli.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/share/qbs/modules/cli/cli.js b/share/qbs/modules/cli/cli.js index 4b8bcc461..5ea333928 100755 --- a/share/qbs/modules/cli/cli.js +++ b/share/qbs/modules/cli/cli.js @@ -168,9 +168,7 @@ function prepareCompiler(product, inputs, output) { args.push("/resource:" + pathFunction(inputs["cli.resources"][i].filePath)); // Additional compiler flags - var allFlags = (platformCompilerFlags || []).concat(compilerFlags || []); - if (allFlags.length > 0) - args.push(allFlags[i]); + args = args.concat((platformCompilerFlags || []).concat(compilerFlags || [])); args.push("/out:" + pathFunction(output.filePath)); |