From 33e9cd462a6c7b6dc552669361f4321ffdb22ff3 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Fri, 17 Jun 2016 15:09:26 -0700 Subject: Do the OS X to macOS rename. [ChangeLog] The "osx" value in qbs.hostOS and qbs.targetOS has been replaced with "macos". For backwards compatibility, qbs.hostOS will still contain "osx" in addition to "macos", and an error will be printed if qbs.targetOS contains "osx" but not "macos". Specifying "macos" without "osx" is allowed. These checks are subject to be removed in a future version of qbs, so update your hostOS and targetOS checks accordingly. [ChangeLog] cpp.minimumOsxVersion has been deprecated and replaced with cpp.minimumMacosVersion. cpp.minimumOsxVersion is subject to be removed in a future version of qbs, so update your projects accordingly. Change-Id: I479891829dff6eb6750cb2a04e1395f085896f63 Reviewed-by: Jake Petroules --- share/qbs/modules/bundle/BundleModule.qbs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'share/qbs/modules/bundle/BundleModule.qbs') diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs index f1a80a668..bf30a687a 100644 --- a/share/qbs/modules/bundle/BundleModule.qbs +++ b/share/qbs/modules/bundle/BundleModule.qbs @@ -82,7 +82,7 @@ Module { var reader = new Bundle.XcodeBuildSpecsReader(specsPath, specsSeparator, additionalSettings, - !qbs.targetOS.contains("osx")); + !qbs.targetOS.contains("macos")); var settings = reader.expandedSettings(_productTypeIdentifier); if (settings) { xcodeSettings = settings; @@ -143,7 +143,7 @@ Module { property var infoPlist property bool processInfoPlist: true property bool embedInfoPlist: product.type.contains("application") && !isBundle - property string infoPlistFormat: qbs.targetOS.contains("osx") ? "same-as-input" : "binary1" + property string infoPlistFormat: qbs.targetOS.contains("macos") ? "same-as-input" : "binary1" property string localizedResourcesFolderSuffix: ".lproj" @@ -735,7 +735,7 @@ Module { } if (product.type.contains("application") - && product.moduleProperty("qbs", "targetOS").contains("osx")) { + && product.moduleProperty("qbs", "targetOS").contains("macos")) { cmd = new Command(ModUtils.moduleProperty(product, "lsregisterPath"), ["-f", bundles[i].filePath]); cmd.description = "register " + ModUtils.moduleProperty(product, "bundleName"); -- cgit v1.2.3