ModUtils: Deal sensibly with undefined values

Change-Id: Id51424820249b05e327f8a709ab716359529131d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

1 files changed, 8 insertions, 3 deletions

diff --git a/share/qbs/imports/qbs/ModUtils/utils.js b/share/qbs/imports/qbs/ModUtils/utils.js
index 2eabde78a..30302e111 100644
--- a/share/qbs/imports/qbs/ModUtils/utils.js
+++ b/share/qbs/imports/qbs/ModUtils/utils.js
@@ -163,9 +163,14 @@ function languagePropertyName(propertyName, fileTag) {
 }
 
 function modulePropertiesFromArtifacts(product, artifacts, moduleName, propertyName, langFilter) {
-    var result = product.moduleProperty(moduleName, languagePropertyName(propertyName, langFilter))
-    for (var i in artifacts)
-        result = result.concat(artifacts[i].moduleProperty(moduleName, languagePropertyName(propertyName, langFilter)))
+    var result = product.moduleProperty(
+                moduleName, languagePropertyName(propertyName, langFilter)) || [];
+    for (var i in artifacts) {
+        var artifactProp = artifacts[i].moduleProperty(
+                    moduleName, languagePropertyName(propertyName, langFilter));
+        if (artifactProp)
+            result = result.concat(artifactProp);
+    }
     return sanitizedList(result, product, moduleName + "." + propertyName);
 }