Merge 2.1 into master

Change-Id: I6176c269e1cb23e88179d6e53f1f2bf57a668176

1 files changed, 8 insertions, 5 deletions

diff --git a/share/qbs/modules/dmg/dmg.js b/share/qbs/modules/dmg/dmg.js
index 4bd735e90..06fe7b906 100644
--- a/share/qbs/modules/dmg/dmg.js
+++ b/share/qbs/modules/dmg/dmg.js
@@ -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,
-        "build_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) {