1 files changed, 16 insertions, 11 deletions

diff --git a/share/qbs/modules/dmg/dmg.js b/share/qbs/modules/dmg/dmg.js
index 4d972db9b..06fe7b906 100644
--- a/share/qbs/modules/dmg/dmg.js
+++ b/share/qbs/modules/dmg/dmg.js
@@ -57,7 +57,7 @@ function dmgbuildSettings(product, inputs) {
         volumeIcon = volumeIcons[0].filePath;
     }
 
-    var licenseFileObjects = Array.prototype.map.call(inputs["dmg.license"], function (a) {
+    var licenseFileObjects = Array.prototype.map.call(inputs["dmg.license"] || [], function (a) {
         return {
             "dmg": {
                 "licenseLocale": localizationFromArtifact(a),
@@ -97,14 +97,14 @@ function dmgbuildSettings(product, inputs) {
         }, {});
     }
 
-    var contentsArray = Array.prototype.map.call(inputs["dmg.input"], function (a) {
+    var contentsArray = Array.prototype.map.call(inputs["dmg.input"] || [], function (a) {
         if (a.dmg.sourceBase && !a.filePath.startsWith(a.dmg.sourceBase)) {
             throw new Error("Cannot install '" + a.filePath + "', " +
                             "because it doesn't start with the value of " +
                             "dmg.sourceBase '" + a.dmg.sourceBase + "'.");
         }
 
-        var isSymlink = a.fileTags.contains("dmg.input.symlink");
+        var isSymlink = a.fileTags.includes("dmg.input.symlink");
         return {
             "x": a.dmg.iconX,
             "y": a.dmg.iconY,
@@ -114,7 +114,7 @@ function dmgbuildSettings(product, inputs) {
         };
     });
 
-    Array.prototype.forEach.call(product.dmg.iconPositions, function (obj) {
+    Array.prototype.forEach.call(product.dmg.iconPositions || [], function (obj) {
         var existingIndex = -1;
         Array.prototype.forEach.call(contentsArray, function (contentsItem, i) {
             if (contentsItem["name"] === obj["path"])
@@ -135,7 +135,7 @@ function dmgbuildSettings(product, inputs) {
         }
     });
 
-    return {
+    var result = {
         "title": product.dmg.volumeName,
         "icon": !product.dmg.badgeVolumeIcon ? volumeIcon : undefined,
         "badge-icon": product.dmg.badgeVolumeIcon ? volumeIcon : undefined,
@@ -154,13 +154,16 @@ function dmgbuildSettings(product, inputs) {
         },
         "format": product.dmg.format,
         "compression-level": product.dmg.compressionLevel,
-        "license": {
+        "contents": contentsArray
+    };
+    if (licenseFileObjects.length >= 0) {
+        result["license"] = {
             "default-language": product.dmg.defaultLicenseLocale,
             "licenses": reduceLicensesForKey(licenseFileObjects, "licenses"),
             "buttons": reduceLicensesForKey(licenseFileObjects, "buttons")
-        },
-        "contents": contentsArray
-    };
+        };
+    }
+    return result;
 }
 
 function prepareLicense(project, product, inputs, outputs, input, output) {
@@ -199,8 +202,10 @@ function prepareDmg(project, product, inputs, outputs, input, output) {
     cmds.push(cmd);
 
     // Create the actual DMG via dmgbuild
-    cmd = new Command(FileInfo.joinPaths(product.qbs.libexecPath, "dmgbuild"),
-                      [product.dmg.volumeName,
+    cmd = new Command(product.dmg.pythonExePath,
+                      ["-m",
+                      "dmgbuild",
+                       product.dmg.volumeName,
                        output.filePath,
                        "--no-hidpi", // qbs handles this by itself
                        "--settings", settingsJsonFilePath]);