diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-05-27 12:35:05 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-05-28 14:20:05 +0200 |
| commit | aa7e0ec2a33e65be6e703f11642876c28eacabc8 (patch) | |
| tree | 8dc9331049e28228879374a54ba19ddb96544f13 /share | |
| parent | 8fa110847f7156c994dec9bce09be83ca46c148f (diff) | |
Fix access to null object in MSVC linker rules.
We no longer require object files to be present when linking.
Change-Id: I7110df35e65578964b7f4b5d12b8b10a5854cc01
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/cpp/msvc.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js index 3eb805556..9206eb941 100644 --- a/share/qbs/modules/cpp/msvc.js +++ b/share/qbs/modules/cpp/msvc.js @@ -169,7 +169,7 @@ function prepareLinker(product, inputs, outputs, libraryPaths, dynamicLibraries, linkerOutputNativeFilePath = FileInfo.toWindowsSeparators(primaryOutput.filePath); } - var allInputs = inputs.obj.concat(inputs.staticlibrary || []) + var allInputs = (inputs.obj || []).concat(inputs.staticlibrary || []) if (inputs.dynamiclibrary_import) allInputs = allInputs.concat(inputs.dynamiclibrary_import); for (i in allInputs) { |