Check that inputs.partial_infoplists is not empty

Also change the style of checking for the rest of the inputs.

Amends regression introduced by
74e518ef6f6b89dd783ec8ffc8cf1d0c713cf14a .

Change-Id: Iddd9b4f1d1688f09e10add41a55e4b4ae6ca7bbc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 17 insertions, 16 deletions

diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs
index fbec31d5b..7752ee65e 100644
--- a/share/qbs/modules/bundle/BundleModule.qbs
+++ b/share/qbs/modules/bundle/BundleModule.qbs
@@ -310,15 +310,14 @@ Module {
                 // Contains the combination of default, file, and in-source keys and values
                 // Start out with the contents of this file as the "base", if given
                 var aggregatePlist = {};
-                if (typeof inputs.infoplist !== 'undefined') {
-                    for (i = 0; i < inputs.infoplist.length; ++i) {
-                        aggregatePlist =
-                                BundleTools.infoPlistContents(inputs.infoplist[i].filePath);
-                        infoPlistFormat = (infoPlistFormat === "same-as-input")
-                                ? BundleTools.infoPlistFormat(inputs.infoplist[i].filePath)
-                                : "xml1";
-                        break;
-                    }
+
+                for (i = 0; i < (inputs.infoplist || []).length; ++i) {
+                    aggregatePlist =
+                            BundleTools.infoPlistContents(inputs.infoplist[i].filePath);
+                    infoPlistFormat = (infoPlistFormat === "same-as-input")
+                            ? BundleTools.infoPlistFormat(inputs.infoplist[i].filePath)
+                            : "xml1";
+                    break;
                 }
 
                 // Add local key-value pairs (overrides equivalent keys specified in the file if
@@ -407,10 +406,10 @@ Module {
                                 + varName + "' when expanding value for key '" + key
                                 + "', defined in one of the following files:\n\t";
                         var allFilePaths = [];
-                        if (typeof inputs.infoplist !== 'undefined') {
-                            for (i = 0; i < inputs.infoplist.length; ++i)
-                                allFilePaths.push(inputs.infoplist[i].filePath);
-                        }
+
+                        for (i = 0; i < (inputs.infoplist || []).length; ++i)
+                            allFilePaths.push(inputs.infoplist[i].filePath);
+
                         if (platformInfoPlist)
                             allFilePaths.push(platformInfoPlist);
                         msg += allFilePaths.join("\n\t") + "\n";
@@ -420,16 +419,18 @@ Module {
                     };
                     aggregatePlist = expander.expand(aggregatePlist, env);
 
-                    // Add keys from partial Info.plists from asset catalogs, XIBs, and storyboards
-                    for (var j = 0; j < inputs.partial_infoplist.length; ++j) {
+                    // Add keys from partial Info.plists from asset catalogs, XIBs, and storyboards.
+                    for (var j = 0; j < (inputs.partial_infoplist || []).length; ++j) {
                         var partialInfoPlist =
-                                BundleTools.infoPlistContents(inputs.partial_infoplist[j].filePath)
+                                BundleTools.infoPlistContents(
+                                    inputs.partial_infoplist[j].filePath)
                                 || {};
                         for (key in partialInfoPlist) {
                             if (partialInfoPlist.hasOwnProperty(key))
                                 aggregatePlist[key] = partialInfoPlist[key];
                         }
                     }
+
                 }
 
                 // Anything with an undefined or otherwise empty value should be removed