diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-05-19 18:38:05 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-05-20 09:50:00 +0000 |
| commit | 51ccb569a4635e69e7d08ad9368ca95e31b6fb9b (patch) | |
| tree | 8a807eb5146cf5736e259158db962cd3011ddd12 | |
| parent | 2a595c4cca1c566ab068a914f43e29b5c887cc16 (diff) | |
fix concatLibs call
cpp.staticLibraries is an array. Do not pass an array of arrays to
concatLibs.
Change-Id: Ia1726b1b47be06a49bc687dcbfc10a55d313e226
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| -rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index 7de65b1cc..acc0eb30c 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -177,9 +177,8 @@ CppModule { var result = [] for (var i in inputs.staticlibrary) { var lib = inputs.staticlibrary[i] - result = Gcc.concatLibs(result, [lib.filePath, - ModUtils.moduleProperties(lib, - 'staticLibraries')]); + result = Gcc.concatLibs(result, [lib.filePath].concat( + ModUtils.moduleProperties(lib, 'staticLibraries'))); } return result } |