Darwin: Adapt to Xcode 11

- xcspec files can now refer to variables in variable names, as in the
following line:
    CONTENTS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH_SHALLOW_BUNDLE_$
(SHALLOW_BUNDLE))
- Some new environment variables have been introduced and need to be set
when running our probes; e.g. "SWIFT_PLATFORM_TARGET_PREFIX".
- The symbolLinkMode autotest made an invalid assumption about order of
output.

Change-Id: Ic845c2c4a8eafb4ece0f0bb04e6e492681a02979
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 5 insertions, 1 deletions

diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs
index f1845fe30..1e83dc458 100644
--- a/share/qbs/modules/bundle/BundleModule.qbs
+++ b/share/qbs/modules/bundle/BundleModule.qbs
@@ -63,9 +63,13 @@ Module {
             "GENERATE_PKGINFO_FILE": generatePackageInfo !== undefined
                                      ? (generatePackageInfo ? "YES" : "NO")
                                      : undefined,
+            "IS_MACCATALYST": "NO",
+            "LD_RUNPATH_SEARCH_PATHS_NO": [],
             "PRODUCT_NAME": product.targetName,
             "LOCAL_APPS_DIR": Environment.getEnv("HOME") + "/Applications",
             "LOCAL_LIBRARY_DIR": Environment.getEnv("HOME") + "/Library",
+            "SWIFT_PLATFORM_TARGET_PREFIX": isMacOs ? "macos"
+                                                    : qbs.targetOS.contains("ios") ? "ios" : "",
             "TARGET_BUILD_DIR": product.buildDirectory,
             "WRAPPER_NAME": bundleName,
             "WRAPPER_EXTENSION": extension
@@ -427,7 +431,7 @@ Module {
                                 || {};
                         for (key in partialInfoPlist) {
                             if (partialInfoPlist.hasOwnProperty(key)
-                                    && !aggregatePlist.hasOwnProperty(key))
+                                    && aggregatePlist[key] === undefined)
                                 aggregatePlist[key] = partialInfoPlist[key];
                         }
                     }