diff options
58 files changed, 160 insertions, 146 deletions
@@ -7,7 +7,7 @@ Supported Platforms =================== Windows XP SP2 or later -OS X 10.6 or later +macOS 10.6 or later Linux (tested on Debian 6/7 and Ubuntu 13) Building the sources requires Qt 5.1.0 or later. @@ -18,7 +18,7 @@ Prerequisites: * Qt 5.1.0 or later * On Windows: - MinGW or Visual Studio - * On OS X: Xcode + * On macOS: Xcode The installed toolchains have to match the one Qt was compiled with. diff --git a/doc/qbs.qdoc b/doc/qbs.qdoc index 560763d91..ba6075f56 100644 --- a/doc/qbs.qdoc +++ b/doc/qbs.qdoc @@ -514,7 +514,7 @@ \li stringlist \li platform-dependent \li The host operating system. - May contain "windows", "linux", "osx", "darwin", "unix", etc. + May contain "windows", "linux", "macos", "darwin", "unix", etc. \note Do not confuse this with the \c{qbs.targetOS} property, which represents the operating system on which the binaries produced by \QBS will run. \row @@ -522,7 +522,7 @@ \li stringlist \li platform-dependent \li The target operating system. - May contain "windows", "linux", "osx", "darwin", "unix", + May contain "windows", "linux", "macos", "darwin", "unix", "ios", "android", "blackberry", "qnx", etc. \endtable diff --git a/doc/reference/items/applicationextension.qdoc b/doc/reference/items/applicationextension.qdoc index 0f1cea034..2409ad919 100644 --- a/doc/reference/items/applicationextension.qdoc +++ b/doc/reference/items/applicationextension.qdoc @@ -36,8 +36,8 @@ \ingroup list-of-items \title ApplicationExtension Item - \brief Represents a product that is an OS X or iOS Application Extension. + \brief Represents a product that is an iOS, macOS, tvOS, or watchOS Application Extension. An \c ApplicationExtension item is a convenience item based on \c XPCService that - sets some properties required for OS X and iOS Application Extensions. + sets some properties required for iOS, macOS, tvOS, or watchOS Application Extensions. */ diff --git a/doc/reference/items/autotestrunner.qdoc b/doc/reference/items/autotestrunner.qdoc index 5721f1c03..776dcffa9 100644 --- a/doc/reference/items/autotestrunner.qdoc +++ b/doc/reference/items/autotestrunner.qdoc @@ -88,7 +88,7 @@ \li A list of environment variables that are added to the run environment. They are provided as a list of strings in the form "varName=value". By default, DYLD_LIBRARY_PATH, DYLD_FRAMEWORK_PATH, and DYLD_ROOT_PATH - are set on OS X and iOS, or an empty list for other platforms. + are set on macOS, or an empty list for other platforms. \row \li limitToSubProject \li bool diff --git a/doc/reference/items/product.qdoc b/doc/reference/items/product.qdoc index a04e9f068..ab1ba45da 100644 --- a/doc/reference/items/product.qdoc +++ b/doc/reference/items/product.qdoc @@ -147,7 +147,7 @@ \li linker-dependent \li If true, a console application is generated. If false, a GUI application is generated. Only takes effect on Windows. - This property also influences the default application type on OS X and iOS. + This property also influences the default application type on Apple platforms. If true, an application bundle is generated. If false, a normal executable is generated. \row @@ -162,7 +162,7 @@ \li string \li undefined \li The version number of the product. Used in shared library filenames and generated - Info.plist files in OS X and iOS application and framework bundles, for example. + Info.plist files in Apple application and framework bundles, for example. \endtable The following properties are automatically set by \QBS and cannot be changed by the user: diff --git a/doc/reference/items/xpcservice.qdoc b/doc/reference/items/xpcservice.qdoc index cdbe8e5c8..af49c8435 100644 --- a/doc/reference/items/xpcservice.qdoc +++ b/doc/reference/items/xpcservice.qdoc @@ -35,8 +35,8 @@ \ingroup list-of-items \title XPCService Item - \brief Represents a product that is an OS X or iOS XPC service. + \brief Represents a product that is a macOS, iOS, tvOS, or watchOS XPC service. An \c XPCService item is a convenience item based on \c Application that - sets some properties required for OS X and iOS XPC services. + sets some properties required for macOS, iOS, tvOS, or watchOS XPC services. */ diff --git a/doc/reference/jsextensions/jsextension-propertylist.qdoc b/doc/reference/jsextensions/jsextension-propertylist.qdoc index bce582655..b6fe87f90 100644 --- a/doc/reference/jsextensions/jsextension-propertylist.qdoc +++ b/doc/reference/jsextensions/jsextension-propertylist.qdoc @@ -39,7 +39,7 @@ The \c PropertyList service allows you to read and write property list files in all formats supported by the Core Foundation API: XML, binary, JSON, and OpenStep (read-only). - This service is only available on Darwin platforms such as OS X and iOS. + This service is only available on Darwin platforms such as iOS, macOS, tvOS, and watchOS. \section1 Available operations diff --git a/doc/reference/modules/bundle-module.qdoc b/doc/reference/modules/bundle-module.qdoc index eebf021cc..1d88c1fac 100644 --- a/doc/reference/modules/bundle-module.qdoc +++ b/doc/reference/modules/bundle-module.qdoc @@ -71,9 +71,9 @@ \li isShallow \li \c{bool} (read only) \li 1.4 - \li \c{false} on OS X, otherwise \c{true} + \li \c{false} on macOS, otherwise \c{true} \li Whether the bundle directory tree is "shallow", i.e. whether it lacks a Contents - subdirectory. This is the default on all platforms other than OS X. + subdirectory. This is the default on all platforms other than macOS. \row \li identifierPrefix \li \c{string} @@ -195,7 +195,7 @@ \li \c{string} \li 1.4 \li \c{"binary1"} for iOS; - \c{"same-as-input"} or \c{"xml1"} for OS X depending on whether a plist file is used; + \c{"same-as-input"} or \c{"xml1"} for macOS depending on whether a plist file is used; \c{undefined} for all other operating systems. \li The file format to write the product's resulting Info.plist in. Possible values: \c{"xml1"}, \c{"binary1"}, \c{"json"}, \c{"same-as-input"} diff --git a/doc/reference/modules/cpp-module.qdoc b/doc/reference/modules/cpp-module.qdoc index 03b6393bb..b0c731318 100644 --- a/doc/reference/modules/cpp-module.qdoc +++ b/doc/reference/modules/cpp-module.qdoc @@ -38,7 +38,7 @@ \brief Provides C/C++ support. The \c cpp module contains the properties and rules for toolchains of the C/C++ family. - On OS X this includes support for Objective-C/C++. + On Apple platforms this includes support for Objective-C/C++. \section1 General Properties @@ -415,8 +415,8 @@ \li 1.0 \li \c{undefined} \li The prefix for the internal install name (LC_ID_DYLIB) of a dynamic library on Darwin - (OS X and iOS). Typically this should be set to \c{"@rpath"} on modern platforms that - support it, which includes OS X 10.5 and above, and all versions of iOS. + (macOS and iOS). Typically this should be set to \c{"@rpath"} on modern platforms that + support it, which includes macOS 10.5 and above, and all versions of iOS. \b Deprecated: use \c{cpp.sonamePrefix} instead. \row \li automaticReferenceCounting @@ -430,7 +430,7 @@ \li \c{bool} \li 1.4 \li \c{undefined} - \li Whether to enforce the use of only app-extension-safe APIs on OS X and iOS. This is + \li Whether to enforce the use of only app-extension-safe APIs on Apple platforms. This is necessary for building Application Extensions in OS X Yosemite and iOS 8 and above. If \c{undefined}, uses the compiler and linker defaults (probably \c{false}). \row @@ -446,7 +446,13 @@ \li \c{string} \li 1.0.1 \li undefined, but may be set by generated profiles - \li A version number in the format [major].[minor] indicating the earliest version of OS X + \li Deprecated in \QBS 1.5.2. Use \c minimumMacosVersion instead. + \row + \li minimumMacosVersion + \li \c{string} + \li 1.5.2 + \li undefined, but may be set by generated profiles + \li A version number in the format [major].[minor] indicating the earliest version of macOS that the product should run on. Passes -mmacosx-version-min=<version> to the compiler. If undefined, compiler defaults will be used. \row diff --git a/doc/reference/modules/ib-module.qdoc b/doc/reference/modules/ib-module.qdoc index 11a7eace2..32966c37f 100644 --- a/doc/reference/modules/ib-module.qdoc +++ b/doc/reference/modules/ib-module.qdoc @@ -40,7 +40,7 @@ The \c ib module contains properties and rules for building Interface Builder documents, storyboards, asset catalogs, and icon sets. - This module is only available on OS X and iOS. + This module is only available on Apple platforms. \section1 General Properties diff --git a/doc/reference/modules/java-module.qdoc b/doc/reference/modules/java-module.qdoc index 928b7ab1c..36b8fc133 100644 --- a/doc/reference/modules/java-module.qdoc +++ b/doc/reference/modules/java-module.qdoc @@ -132,7 +132,7 @@ \list \li \c JAVA_HOME environment variable (all platforms) \li Registry (Windows) - \li \c java_home tool (OS X) + \li \c java_home tool (macOS) \li Known JDK paths (other Unix platforms) \endlist \row diff --git a/doc/reference/modules/qbs-module.qdoc b/doc/reference/modules/qbs-module.qdoc index 11b7246f7..0e5629f55 100644 --- a/doc/reference/modules/qbs-module.qdoc +++ b/doc/reference/modules/qbs-module.qdoc @@ -101,7 +101,7 @@ \c{"irix"}, \c{"linux"}, \c{"lynx"}, - \c{"osx"}, + \c{"macos"}, \c{"msdos"}, \c{"nacl"}, \c{"netbsd"}, diff --git a/doc/reference/modules/xcode-module.qdoc b/doc/reference/modules/xcode-module.qdoc index c1eafddbc..60095e4d9 100644 --- a/doc/reference/modules/xcode-module.qdoc +++ b/doc/reference/modules/xcode-module.qdoc @@ -73,7 +73,7 @@ \li stringList \li 1.5 \li determined by \c{qbs.targetOS} - \li List of the Apple devices targeted by this product. For OS X, watchOS, and tvOS, this + \li List of the Apple devices targeted by this product. For macOS, watchOS, and tvOS, this should always be "mac", "watch", and "tv", respectively. For iOS, this can be one or both of "iphone" and "ipad". The default is the list of all device types supported by the current platform. diff --git a/examples/cocoa-application/CocoaApplication.qbs b/examples/cocoa-application/CocoaApplication.qbs index 472f22231..32e926168 100644 --- a/examples/cocoa-application/CocoaApplication.qbs +++ b/examples/cocoa-application/CocoaApplication.qbs @@ -40,7 +40,7 @@ import qbs 1.0 CppApplication { Depends { condition: product.condition; name: "ib" } - condition: qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("macos") name: "Cocoa Application" cpp.precompiledHeader: "CocoaApplication/CocoaApplication-Prefix.pch" diff --git a/share/qbs/imports/qbs/DarwinTools/darwin-tools.js b/share/qbs/imports/qbs/DarwinTools/darwin-tools.js index 50605c84b..7e040b756 100644 --- a/share/qbs/imports/qbs/DarwinTools/darwin-tools.js +++ b/share/qbs/imports/qbs/DarwinTools/darwin-tools.js @@ -42,14 +42,14 @@ var _deviceMap = { var _platformMap = { "ios": "iPhone", - "osx": "MacOSX", + "macos": "MacOSX", "tvos": "AppleTV", "watchos": "Watch" }; var _platformDeviceMap = { "ios": ["iphone", "ipad"], - "osx": ["mac"], + "macos": ["mac"], "tvos": ["tv"], "watchos": ["watch"] } diff --git a/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs b/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs index 98066a481..9f282c953 100644 --- a/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs +++ b/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs @@ -46,7 +46,7 @@ PathProbe { if (qbs.hostOS.contains("windows")) paths.push(FileInfo.joinPaths(Environment.getEnv("LOCALAPPDATA"), "Android", "sdk", "ndk-bundle")); - if (qbs.hostOS.contains("osx")) + if (qbs.hostOS.contains("macos")) paths.push(FileInfo.joinPaths(Environment.getEnv("HOME"), "Library", "Android", "sdk", "ndk-bundle")); if (qbs.hostOS.contains("linux")) diff --git a/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs b/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs index 0d10bbffe..acd5c0003 100644 --- a/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs +++ b/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs @@ -39,7 +39,7 @@ PathProbe { platformPaths: { if (qbs.hostOS.contains("windows")) return [FileInfo.joinPaths(Environment.getEnv("LOCALAPPDATA"), "Android", "sdk")]; - if (qbs.hostOS.contains("osx")) + if (qbs.hostOS.contains("macos")) return [FileInfo.joinPaths(Environment.getEnv("HOME"), "Library", "Android", "sdk")]; if (qbs.hostOS.contains("linux")) return [FileInfo.joinPaths(Environment.getEnv("HOME"), "Android", "Sdk")]; diff --git a/share/qbs/imports/qbs/base/ApplicationExtension.qbs b/share/qbs/imports/qbs/base/ApplicationExtension.qbs index c0bfe9406..1034f5095 100644 --- a/share/qbs/imports/qbs/base/ApplicationExtension.qbs +++ b/share/qbs/imports/qbs/base/ApplicationExtension.qbs @@ -38,7 +38,7 @@ XPCService { cpp.entryPoint: "_NSExtensionMain" cpp.frameworks: { var frameworks = base.concat(["Foundation"]); - if (qbs.targetOS.contains("osx") && parseInt(xcode.sdkVersion.split(".")[1], 10) < 11 || + if (qbs.targetOS.contains("macos") && parseInt(xcode.sdkVersion.split(".")[1], 10) < 11 || qbs.targetOS.contains("ios") && parseInt(xcode.sdkVersion.split(".")[0], 10) < 9) { frameworks = base.concat(["/System/Library/PrivateFrameworks/PlugInKit.framework"]); } diff --git a/share/qbs/modules/archiver/archiver.qbs b/share/qbs/modules/archiver/archiver.qbs index c05decb02..540d75f1d 100644 --- a/share/qbs/modules/archiver/archiver.qbs +++ b/share/qbs/modules/archiver/archiver.qbs @@ -159,7 +159,7 @@ Module { args.push("-cfM", output.filePath, "@" + input.filePath); } else if (binaryName === "zip") { // The "zip" program included with most Linux and Unix distributions - // (including OS X) is Info-ZIP's Zip, so this should be fairly portable. + // (including macOS) is Info-ZIP's Zip, so this should be fairly portable. if (compression === "none") { args.push("-0"); } else { 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"); diff --git a/share/qbs/modules/bundle/bundle.js b/share/qbs/modules/bundle/bundle.js index 32307aa9e..71210b833 100644 --- a/share/qbs/modules/bundle/bundle.js +++ b/share/qbs/modules/bundle/bundle.js @@ -135,7 +135,7 @@ var XcodeBuildSpecsReader = (function () { if (typesObject["BasedOn"]) { // We'll only do the auto shallow substitution for wrapper package types... // this ensures that in-app purchase content bundles are non-shallow on both - // OS X and iOS, for example (which matches Xcode behavior) + // macOS and iOS, for example (which matches Xcode behavior) var isWrapper = false; if (typesObject["ProductReference"]) { var fileType = typesObject["ProductReference"]["FileType"]; diff --git a/share/qbs/modules/cli/mono.qbs b/share/qbs/modules/cli/mono.qbs index 6ce1ea3e6..792e24257 100644 --- a/share/qbs/modules/cli/mono.qbs +++ b/share/qbs/modules/cli/mono.qbs @@ -9,7 +9,7 @@ CLIModule { fsharpCompilerName: "fsharpc" toolchainInstallPath: { - if (qbs.hostOS.contains("osx")) + if (qbs.hostOS.contains("macos")) return "/Library/Frameworks/Mono.framework/Commands"; } } diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs index 7dabab95e..be2057ef0 100644 --- a/share/qbs/modules/cpp/CppModule.qbs +++ b/share/qbs/modules/cpp/CppModule.qbs @@ -83,10 +83,12 @@ Module { } property string minimumOsxVersion + + property string minimumMacosVersion: minimumOsxVersion PropertyOptions { - name: "minimumOsxVersion" + name: "minimumMacosVersion" description: "a version number in the format [major].[minor] indicating the earliest \ - version of OS X that the product should run on. passes -mmacosx-version-min=<version> \ + version of macOS that the product should run on. passes -mmacosx-version-min=<version> \ to the compiler. if undefined, compiler defaults will be used." } @@ -135,7 +137,7 @@ Module { PropertyOptions { name: "installNamePrefix" description: "The prefix for the internal install name (LC_ID_DYLIB) of a dynamic library \ - on Darwin (OS X and iOS)." + on Darwin (macOS and iOS)." } property pathList includePaths @@ -297,7 +299,7 @@ Module { property stringList platformObjcxxFlags property stringList platformLinkerFlags - // OS X and iOS properties + // Apple platforms properties property bool automaticReferenceCounting PropertyOptions { name: "automaticReferenceCounting" diff --git a/share/qbs/modules/cpp/DarwinGCC.qbs b/share/qbs/modules/cpp/DarwinGCC.qbs index 7232eb0d8..d4a5003ca 100644 --- a/share/qbs/modules/cpp/DarwinGCC.qbs +++ b/share/qbs/modules/cpp/DarwinGCC.qbs @@ -69,11 +69,11 @@ UnixGCC { property var defaultInfoPlist: { var dict = {}; - if (qbs.targetOS.contains("osx")) { + if (qbs.targetOS.contains("macos")) { dict["NSPrincipalClass"] = "NSApplication"; // needed for Retina display support - if (minimumOsxVersion) - dict["LSMinimumSystemVersion"] = minimumOsxVersion; + if (minimumMacosVersion) + dict["LSMinimumSystemVersion"] = minimumMacosVersion; } if (qbs.targetOS.containsAny(["ios", "tvos"])) { @@ -130,8 +130,8 @@ UnixGCC { // because this indicates the default deployment target for that OS if (qbs.targetOS.contains("ios")) env["IPHONEOS_DEPLOYMENT_TARGET"] = minimumIosVersion || ""; - if (qbs.targetOS.contains("osx")) - env["MACOSX_DEPLOYMENT_TARGET"] = minimumOsxVersion || ""; + if (qbs.targetOS.contains("macos")) + env["MACOSX_DEPLOYMENT_TARGET"] = minimumMacosVersion || ""; if (qbs.targetOS.contains("watchos")) env["WATCHOS_DEPLOYMENT_TARGET"] = minimumWatchosVersion || ""; if (qbs.targetOS.contains("tvos")) diff --git a/share/qbs/modules/cpp/ios-gcc.qbs b/share/qbs/modules/cpp/ios-gcc.qbs index 0708a22ef..49c7c645c 100644 --- a/share/qbs/modules/cpp/ios-gcc.qbs +++ b/share/qbs/modules/cpp/ios-gcc.qbs @@ -35,7 +35,7 @@ import qbs.FileInfo import qbs.ModUtils DarwinGCC { - condition: qbs.hostOS.contains('osx') && + condition: qbs.hostOS.contains('macos') && qbs.targetOS.contains('ios') && qbs.toolchain && qbs.toolchain.contains('gcc') diff --git a/share/qbs/modules/cpp/osx-gcc.qbs b/share/qbs/modules/cpp/macos-gcc.qbs index a6c674d2c..af107d738 100644 --- a/share/qbs/modules/cpp/osx-gcc.qbs +++ b/share/qbs/modules/cpp/macos-gcc.qbs @@ -32,13 +32,13 @@ import qbs 1.0 import qbs.ModUtils DarwinGCC { - condition: qbs.hostOS.contains('osx') && - qbs.targetOS.contains('osx') && + condition: qbs.hostOS.contains('macos') && + qbs.targetOS.contains('macos') && qbs.toolchain && qbs.toolchain.contains('gcc') - targetSystem: "macosx" + (minimumOsxVersion || "") + targetSystem: "macosx" + (minimumMacosVersion || "") - minimumDarwinVersion: minimumOsxVersion + minimumDarwinVersion: minimumMacosVersion minimumDarwinVersionCompilerFlag: "-mmacosx-version-min" minimumDarwinVersionLinkerFlag: "-macosx_version_min" } diff --git a/share/qbs/modules/cpp/tvos-gcc.qbs b/share/qbs/modules/cpp/tvos-gcc.qbs index 0e5f059d3..5378fa1b7 100644 --- a/share/qbs/modules/cpp/tvos-gcc.qbs +++ b/share/qbs/modules/cpp/tvos-gcc.qbs @@ -31,7 +31,7 @@ import qbs DarwinGCC { - condition: qbs.hostOS.contains('osx') && + condition: qbs.hostOS.contains('macos') && qbs.targetOS.contains('tvos') && qbs.toolchain && qbs.toolchain.contains('gcc') diff --git a/share/qbs/modules/cpp/watchos-gcc.qbs b/share/qbs/modules/cpp/watchos-gcc.qbs index e188eee8e..350cba02e 100644 --- a/share/qbs/modules/cpp/watchos-gcc.qbs +++ b/share/qbs/modules/cpp/watchos-gcc.qbs @@ -32,7 +32,7 @@ import qbs DarwinGCC { - condition: qbs.hostOS.contains('osx') && + condition: qbs.hostOS.contains('macos') && qbs.targetOS.contains('watchos') && qbs.toolchain && qbs.toolchain.contains('gcc') diff --git a/share/qbs/modules/java/JavaModule.qbs b/share/qbs/modules/java/JavaModule.qbs index 69845adc9..89ff2857c 100644 --- a/share/qbs/modules/java/JavaModule.qbs +++ b/share/qbs/modules/java/JavaModule.qbs @@ -128,7 +128,7 @@ Module { property path internalClassFilesDir: FileInfo.joinPaths(product.buildDirectory, ".classes") property path runtimeJarPath: { - if (qbs.hostOS.contains("osx") && compilerVersionMajor === 1 && compilerVersionMinor < 7) + if (qbs.hostOS.contains("macos") && compilerVersionMajor === 1 && compilerVersionMinor < 7) return FileInfo.joinPaths(jdkPath, "bundle", "Classes", "classes.jar"); return FileInfo.joinPaths(jdkPath, "jre", "lib", "rt.jar"); } diff --git a/share/qbs/modules/java/utils.js b/share/qbs/modules/java/utils.js index 18f0db033..4fdccf090 100644 --- a/share/qbs/modules/java/utils.js +++ b/share/qbs/modules/java/utils.js @@ -95,7 +95,7 @@ function findJdkPath(hostOS, arch, environmentPaths, searchPaths) { return undefined; } - if (hostOS.contains("osx")) { + if (hostOS.contains("macos")) { var p = new Process(); try { // We filter by architecture here so that we'll get a compatible JVM for JNI use. diff --git a/share/qbs/modules/qbs/common.qbs b/share/qbs/modules/qbs/common.qbs index 3732b91a7..9891cf407 100644 --- a/share/qbs/modules/qbs/common.qbs +++ b/share/qbs/modules/qbs/common.qbs @@ -42,7 +42,7 @@ Module { property string optimization: (buildVariant == "debug" ? "none" : "fast") readonly property stringList hostOS: undefined // set internally property string hostOSVersion: { - if (hostOS && hostOS.contains("osx")) { + if (hostOS && hostOS.contains("macos")) { return Utilities.getNativeSetting("/System/Library/CoreServices/ServerVersion.plist", "ProductVersion") || Utilities.getNativeSetting("/System/Library/CoreServices/SystemVersion.plist", "ProductVersion"); } else if (hostOS && hostOS.contains("windows")) { @@ -52,7 +52,7 @@ Module { } property string hostOSBuildVersion: { - if (hostOS.contains("osx")) { + if (hostOS.contains("macos")) { return Utilities.getNativeSetting("/System/Library/CoreServices/ServerVersion.plist", "ProductBuildVersion") || Utilities.getNativeSetting("/System/Library/CoreServices/SystemVersion.plist", "ProductBuildVersion"); } else if (hostOS.contains("windows")) { @@ -96,7 +96,13 @@ Module { var validator = new ModUtils.PropertyValidator("qbs"); validator.setRequiredProperty("hostOS", hostOS); validator.setRequiredProperty("targetOS", targetOS); - if (hostOS && (hostOS.contains("windows") || hostOS.contains("osx"))) { + validator.addCustomValidator("targetOS", targetOS, function (value) { + if (!value || (value.contains("osx") && !value.contains("macos"))) + return false; + return true; + }, "the value 'osx' has been replaced by 'macos'; use that instead and update " + + "hostOS and targetOS condition checks in your project accordingly"); + if (hostOS && (hostOS.contains("windows") || hostOS.contains("macos"))) { validator.setRequiredProperty("hostOSVersion", hostOSVersion, "could not detect host operating system version; " + "verify that system files and registry keys have not " + diff --git a/src/app/config-ui/config-ui.qbs b/src/app/config-ui/config-ui.qbs index 3f31765c1..957824f74 100644 --- a/src/app/config-ui/config-ui.qbs +++ b/src/app/config-ui/config-ui.qbs @@ -14,12 +14,12 @@ QbsApp { ] Group { - condition: qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("macos") files: ["fgapp.mm"] } Properties { - condition: qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("macos") cpp.frameworks: ["ApplicationServices", "Cocoa"] } diff --git a/src/app/config-ui/fgapp.mm b/src/app/config-ui/fgapp.mm index ce3f6e0fe..dff92bb40 100644 --- a/src/app/config-ui/fgapp.mm +++ b/src/app/config-ui/fgapp.mm @@ -31,7 +31,7 @@ #import <AppKit/AppKit.h> #include <ApplicationServices/ApplicationServices.h> -extern "C" void qt_osx_forceTransformProcessToForegroundApplicationAndActivate() +extern "C" void qt_macos_forceTransformProcessToForegroundApplicationAndActivate() { [[NSApplication sharedApplication] setActivationPolicy:NSApplicationActivationPolicyRegular]; [[NSApplication sharedApplication] activateIgnoringOtherApps:YES]; diff --git a/src/app/config-ui/main.cpp b/src/app/config-ui/main.cpp index e5c0876b7..5331f9915 100644 --- a/src/app/config-ui/main.cpp +++ b/src/app/config-ui/main.cpp @@ -40,7 +40,7 @@ using qbs::Internal::Tr; -extern "C" void qt_osx_forceTransformProcessToForegroundApplicationAndActivate(); +extern "C" void qt_macos_forceTransformProcessToForegroundApplicationAndActivate(); int main(int argc, char *argv[]) { @@ -62,8 +62,8 @@ int main(int argc, char *argv[]) // just before UI is shown - this prevents the application icon from popping up in the Dock // when running `qbs help`, and QCoreApplication::arguments() requires the application object // to be constructed, so it is not easily worked around -#ifdef Q_OS_OSX - qt_osx_forceTransformProcessToForegroundApplicationAndActivate(); +#if defined(Q_OS_MACOS) || defined(Q_OS_OSX) + qt_macos_forceTransformProcessToForegroundApplicationAndActivate(); #endif MainWindow mw(clParser.settingsDir()); mw.show(); diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp index c40271357..c65fa78cb 100644 --- a/src/app/qbs-setup-qt/setupqt.cpp +++ b/src/app/qbs-setup-qt/setupqt.cpp @@ -289,7 +289,7 @@ static bool isToolchainProfile(const Profile &profile) QSet<QString> expected = QSet<QString>() << QLatin1String("qbs.toolchain") << QLatin1String("qbs.architecture"); - if (HostOsInfo::isOsxHost()) + if (HostOsInfo::isMacosHost()) expected.insert(QLatin1String("qbs.targetOS")); // match only Xcode profiles return QSet<QString>(actual).unite(expected) == actual; } @@ -344,7 +344,7 @@ static QStringList qbsTargetOsFromQtMkspec(const QString &mkspec) return QStringList() << QLatin1String("lynx") << QLatin1String("unix"); if (mkspec.startsWith(QLatin1String("macx-"))) return QStringList() << (mkspec.startsWith(QLatin1String("macx-ios-")) - ? QLatin1String("ios") : QLatin1String("osx")) + ? QLatin1String("ios") : QLatin1String("macos")) << QLatin1String("darwin") << QLatin1String("bsd") << QLatin1String("unix"); if (mkspec.startsWith(QLatin1String("nacl-")) || mkspec.startsWith(QLatin1String("nacl64-"))) diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp index 728c28739..33f67c19f 100644 --- a/src/app/qbs-setup-toolchains/probe.cpp +++ b/src/app/qbs-setup-toolchains/probe.cpp @@ -279,7 +279,7 @@ void probe(Settings *settings) gccProbe(settings, profiles, QLatin1String("gcc")); gccProbe(settings, profiles, QLatin1String("clang")); - if (HostOsInfo::isOsxHost()) { + if (HostOsInfo::isMacosHost()) { xcodeProbe(settings, profiles); } } diff --git a/src/app/qbs-setup-toolchains/xcodeprobe.cpp b/src/app/qbs-setup-toolchains/xcodeprobe.cpp index 91a71ccf0..a23c3e869 100644 --- a/src/app/qbs-setup-toolchains/xcodeprobe.cpp +++ b/src/app/qbs-setup-toolchains/xcodeprobe.cpp @@ -117,7 +117,7 @@ static QStringList targetOSList(const QString &applePlatformName) { QStringList targetOS; if (applePlatformName == QStringLiteral("macosx")) { - targetOS << QStringLiteral("osx"); + targetOS << QStringLiteral("macos"); } else if (applePlatformName == QStringLiteral("iphoneos")) { targetOS << QStringLiteral("ios"); } else if (applePlatformName == QStringLiteral("iphonesimulator")) { diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index 27f058621..3231777d5 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -407,8 +407,8 @@ QbsLibrary { ] } Group { - condition: qbs.targetOS.contains("osx") - name: "tools (OS X)" + condition: qbs.targetOS.contains("macos") + name: "tools (macOS)" prefix: "tools/" files: [ "applecodesignutils.cpp", diff --git a/src/lib/corelib/jsextensions/propertylist.mm b/src/lib/corelib/jsextensions/propertylist.mm index 0306310c5..65b37f6ae 100644 --- a/src/lib/corelib/jsextensions/propertylist.mm +++ b/src/lib/corelib/jsextensions/propertylist.mm @@ -322,7 +322,7 @@ QByteArray PropertyListPrivate::writeToData(QScriptContext *context, const QStri #endif else { errorString = @"JSON serialization of property lists is not " - @"supported on this version of OS X"; + @"supported on this version of macOS"; } } else if (format == QLatin1String("xml1") || format == QLatin1String("binary1")) { const NSPropertyListFormat plistFormat = format == QLatin1String("xml1") diff --git a/src/lib/corelib/jsextensions/utilitiesextension.cpp b/src/lib/corelib/jsextensions/utilitiesextension.cpp index f4ca809de..52335b02a 100644 --- a/src/lib/corelib/jsextensions/utilitiesextension.cpp +++ b/src/lib/corelib/jsextensions/utilitiesextension.cpp @@ -35,7 +35,7 @@ #include <tools/architectures.h> #include <tools/fileinfo.h> -#ifdef Q_OS_OSX +#if defined(Q_OS_MACOS) || defined(Q_OS_OSX) #include <tools/applecodesignutils.h> #endif @@ -174,7 +174,7 @@ QScriptValue UtilitiesExtension::js_rfc1034identifier(QScriptContext *context, QScriptValue UtilitiesExtension::js_smimeMessageContent(QScriptContext *context, QScriptEngine *engine) { -#ifndef Q_OS_OSX +#if !defined(Q_OS_MACOS) && !defined(Q_OS_OSX) Q_UNUSED(engine); return context->throwError(QScriptContext::UnknownError, QLatin1String("smimeMessageContent is not available on this platform")); @@ -198,7 +198,7 @@ QScriptValue UtilitiesExtension::js_smimeMessageContent(QScriptContext *context, QScriptValue UtilitiesExtension::js_certificateInfo(QScriptContext *context, QScriptEngine *engine) { -#ifndef Q_OS_OSX +#if !defined(Q_OS_MACOS) && !defined(Q_OS_OSX) Q_UNUSED(engine); return context->throwError(QScriptContext::UnknownError, QLatin1String("certificateInfo is not available on this platform")); @@ -214,7 +214,7 @@ QScriptValue UtilitiesExtension::js_certificateInfo(QScriptContext *context, QScriptValue UtilitiesExtension::js_signingIdentities(QScriptContext *context, QScriptEngine *engine) { -#ifndef Q_OS_OSX +#if !defined(Q_OS_MACOS) && !defined(Q_OS_OSX) Q_UNUSED(engine); return context->throwError(QScriptContext::UnknownError, QLatin1String("signingIdentities is not available on this platform")); diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index f878cfc0f..2197dc349 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -1349,8 +1349,8 @@ static QStringList hostOS() #if defined(Q_OS_LYNX) hostSystem << QLatin1String("lynx"); #endif -#if defined(Q_OS_OSX) - hostSystem << QLatin1String("osx"); +#if defined(Q_OS_MACOS) || defined(Q_OS_OSX) + hostSystem << QLatin1String("macos") << QLatin1String("osx"); #endif #if defined(Q_OS_MSDOS) hostSystem << QLatin1String("msdos"); diff --git a/src/lib/corelib/language/testdata/getNativeSetting.qbs b/src/lib/corelib/language/testdata/getNativeSetting.qbs index 122b0e657..ab2943499 100644 --- a/src/lib/corelib/language/testdata/getNativeSetting.qbs +++ b/src/lib/corelib/language/testdata/getNativeSetting.qbs @@ -4,7 +4,7 @@ import qbs.Utilities Project { Product { name: { - if (qbs.hostOS.contains("osx")) { + if (qbs.hostOS.contains("macos")) { return Utilities.getNativeSetting("/System/Library/CoreServices/SystemVersion.plist", "ProductName"); } else if (qbs.hostOS.contains("windows")) { var productName = Utilities.getNativeSetting("HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion", "ProductName"); diff --git a/src/lib/corelib/language/tst_language.cpp b/src/lib/corelib/language/tst_language.cpp index 6ec955caf..3796121cd 100644 --- a/src/lib/corelib/language/tst_language.cpp +++ b/src/lib/corelib/language/tst_language.cpp @@ -664,7 +664,7 @@ void TestLanguage::getNativeSetting() project = loader->loadProject(defaultParameters); QString expectedProductName; - if (HostOsInfo::isOsxHost()) + if (HostOsInfo::isMacosHost()) expectedProductName = QLatin1String("Mac OS X"); else if (HostOsInfo::isWindowsHost()) expectedProductName = QLatin1String("Windows"); @@ -1949,7 +1949,7 @@ void TestLanguage::wildcards() QVERIFY(product); GroupPtr group; if (useGroup) { - QCOMPARE(product->groups.count(), HostOsInfo::isOsxHost() ? 4 : 3); + QCOMPARE(product->groups.count(), HostOsInfo::isMacosHost() ? 4 : 3); foreach (const GroupPtr &rg, product->groups) { if (rg->name == groupName) { group = rg; @@ -1957,7 +1957,7 @@ void TestLanguage::wildcards() } } } else { - QCOMPARE(product->groups.count(), HostOsInfo::isOsxHost() ? 3 : 2); + QCOMPARE(product->groups.count(), HostOsInfo::isMacosHost() ? 3 : 2); group = product->groups.first(); } QVERIFY(group); diff --git a/src/lib/corelib/tools/applecodesignutils.cpp b/src/lib/corelib/tools/applecodesignutils.cpp index add6f9cac..fafb278d7 100644 --- a/src/lib/corelib/tools/applecodesignutils.cpp +++ b/src/lib/corelib/tools/applecodesignutils.cpp @@ -93,7 +93,7 @@ QVariantMap certificateInfo(const QByteArray &data) QVariantMap identitiesProperties() { - // Apple documentation states that the Sec* family of functions are not thread-safe on OS X + // Apple documentation states that the Sec* family of functions are not thread-safe on macOS // https://developer.apple.com/library/mac/documentation/Security/Reference/certifkeytrustservices/ static QMutex securityMutex; QMutexLocker locker(&securityMutex); diff --git a/src/lib/corelib/tools/hostosinfo.h b/src/lib/corelib/tools/hostosinfo.h index 892f3f1bd..3786a4178 100644 --- a/src/lib/corelib/tools/hostosinfo.h +++ b/src/lib/corelib/tools/hostosinfo.h @@ -61,7 +61,7 @@ class QBS_EXPORT HostOsInfo // Exported for use by command-line tools. { public: // Add more as needed. - enum HostOs { HostOsWindows, HostOsLinux, HostOsOsx, HostOsOtherUnix, HostOsOther }; + enum HostOs { HostOsWindows, HostOsLinux, HostOsMacos, HostOsOtherUnix, HostOsOther }; static inline HostOs hostOs(); @@ -75,7 +75,7 @@ public: QLatin1Char('.') + settings.value(QStringLiteral("CurrentBuildNumber")).toString()); Q_ASSERT(v.isValid()); - } else if (HostOsInfo::isOsxHost()) { + } else if (HostOsInfo::isMacosHost()) { QSettings settings(QStringLiteral("/System/Library/CoreServices/SystemVersion.plist"), QSettings::NativeFormat); v = v.fromString(settings.value(QStringLiteral("ProductVersion")).toString()); @@ -86,7 +86,7 @@ public: static bool isWindowsHost() { return hostOs() == HostOsWindows; } static bool isLinuxHost() { return hostOs() == HostOsLinux; } - static bool isOsxHost() { return hostOs() == HostOsOsx; } + static bool isMacosHost() { return hostOs() == HostOsMacos; } static inline bool isAnyUnixHost(); static inline QString rfc1034Identifier(const QString &str); @@ -113,7 +113,7 @@ public: { if (isWindowsHost()) return QStringLiteral("PATH"); - if (isOsxHost()) + if (isMacosHost()) return QStringLiteral("DYLD_LIBRARY_PATH"); return QStringLiteral("LD_LIBRARY_PATH"); } @@ -125,7 +125,7 @@ public: static Qt::KeyboardModifier controlModifier() { - return isOsxHost() ? Qt::MetaModifier : Qt::ControlModifier; + return isMacosHost() ? Qt::MetaModifier : Qt::ControlModifier; } }; @@ -136,7 +136,7 @@ HostOsInfo::HostOs HostOsInfo::hostOs() #elif defined(Q_OS_LINUX) return HostOsLinux; #elif defined(Q_OS_DARWIN) - return HostOsOsx; + return HostOsMacos; #elif defined(Q_OS_UNIX) return HostOsOtherUnix; #else diff --git a/src/lib/corelib/tools/scannerpluginmanager.cpp b/src/lib/corelib/tools/scannerpluginmanager.cpp index 7341fea7c..3bd0609df 100644 --- a/src/lib/corelib/tools/scannerpluginmanager.cpp +++ b/src/lib/corelib/tools/scannerpluginmanager.cpp @@ -70,7 +70,7 @@ void ScannerPluginManager::loadPlugins(const QStringList &pluginPaths, const Log if (HostOsInfo::isWindowsHost()) filters << QLatin1String("*.dll"); - else if (HostOsInfo::isOsxHost()) + else if (HostOsInfo::isMacosHost()) filters << QLatin1String("*.dylib"); else filters << QLatin1String("*.so"); diff --git a/src/lib/qtprofilesetup/qtmoduleinfo.cpp b/src/lib/qtprofilesetup/qtmoduleinfo.cpp index b40af1089..6a6d6f8a8 100644 --- a/src/lib/qtprofilesetup/qtmoduleinfo.cpp +++ b/src/lib/qtprofilesetup/qtmoduleinfo.cpp @@ -608,7 +608,7 @@ QList<QtModuleInfo> allQt5Modules(const Profile &profile, const QtEnvironment &q if (hasV2 && !hasModuleEntry) moduleInfo.hasLibrary = false; - // Fix include paths for OS X and iOS frameworks. + // Fix include paths for Apple frameworks. // The qt_lib_XXX.pri files contain wrong values for versions < 5.6. if (!hasV2 && moduleInfo.isFramework(qtEnvironment)) { moduleInfo.includePaths.clear(); diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp index 9f532f093..e6cfec8c9 100644 --- a/src/lib/qtprofilesetup/qtprofilesetup.cpp +++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp @@ -336,7 +336,7 @@ void doSetupQtProfile(const QString &profileName, Settings *settings, // Set the minimum operating system versions appropriate for this Qt version const QString windowsVersion = guessMinimumWindowsVersion(qtEnvironment); - QString osxVersion, iosVersion, androidVersion; + QString macosVersion, iosVersion, androidVersion; if (!windowsVersion.isEmpty()) { // Is target OS Windows? const Version qtVersion = Version(qtEnvironment.qtMajorVersion, @@ -347,7 +347,7 @@ void doSetupQtProfile(const QString &profileName, Settings *settings, } else if (qtEnvironment.mkspecPath.contains(QLatin1String("macx"))) { profile.setValue(settingsTemplate.arg(QLatin1String("frameworkBuild")), qtEnvironment.frameworkBuild); if (qtEnvironment.qtMajorVersion >= 5) { - osxVersion = QLatin1String("10.6"); + macosVersion = QLatin1String("10.6"); } else if (qtEnvironment.qtMajorVersion == 4 && qtEnvironment.qtMinorVersion >= 6) { QDir qconfigDir; if (qtEnvironment.frameworkBuild) { @@ -372,17 +372,17 @@ void doSetupQtProfile(const QString &profileName, Settings *settings, } while (!line.isNull()); if (ts.status() == QTextStream::Ok) - osxVersion = qtCocoaBuild ? QLatin1String("10.5") : QLatin1String("10.4"); + macosVersion = qtCocoaBuild ? QLatin1String("10.5") : QLatin1String("10.4"); } - if (osxVersion.isEmpty()) { + if (macosVersion.isEmpty()) { throw ErrorInfo(Internal::Tr::tr("Error reading qconfig.h; could not determine " "whether Qt is using Cocoa or Carbon")); } } if (qtEnvironment.qtConfigItems.contains(QLatin1String("c++11"))) - osxVersion = QLatin1String("10.7"); + macosVersion = QLatin1String("10.7"); } if (qtEnvironment.mkspecPath.contains(QLatin1String("ios")) && qtEnvironment.qtMajorVersion >= 5) @@ -400,8 +400,8 @@ void doSetupQtProfile(const QString &profileName, Settings *settings, if (!windowsVersion.isEmpty()) profile.setValue(QLatin1String("cpp.minimumWindowsVersion"), windowsVersion); - if (!osxVersion.isEmpty()) - profile.setValue(QLatin1String("cpp.minimumOsxVersion"), osxVersion); + if (!macosVersion.isEmpty()) + profile.setValue(QLatin1String("cpp.minimumMacosVersion"), macosVersion); if (!iosVersion.isEmpty()) profile.setValue(QLatin1String("cpp.minimumIosVersion"), iosVersion); diff --git a/tests/auto/api/testdata/objc/main.mm b/tests/auto/api/testdata/objc/main.mm index 49b4f3915..90cf06bff 100644 --- a/tests/auto/api/testdata/objc/main.mm +++ b/tests/auto/api/testdata/objc/main.mm @@ -9,6 +9,6 @@ int main(int argc, char **argv) // And Objective-C NSDictionary *version = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"]; NSString *productVersion = [version objectForKey:@"ProductVersion"]; - NSLog(@"Hello, OS X %@!", productVersion); + NSLog(@"Hello, macOS %@!", productVersion); // So it's Objective-C++ } diff --git a/tests/auto/api/testdata/objc/objc.qbs b/tests/auto/api/testdata/objc/objc.qbs index c069c5032..0fa9eb62a 100644 --- a/tests/auto/api/testdata/objc/objc.qbs +++ b/tests/auto/api/testdata/objc/objc.qbs @@ -2,7 +2,7 @@ import qbs 1.0 Project { QtApplication { - condition: qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("macos") files: "main.mm" cpp.frameworks: [ "Foundation" ] } diff --git a/tests/auto/api/testdata/project-with-properties-item/project.qbs b/tests/auto/api/testdata/project-with-properties-item/project.qbs index d59a26a94..91d5de42f 100644 --- a/tests/auto/api/testdata/project-with-properties-item/project.qbs +++ b/tests/auto/api/testdata/project-with-properties-item/project.qbs @@ -5,7 +5,7 @@ Project { property string libPath: "/usr/lib" Properties { - condition: qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("macos") binPath: "/Users/boo" libPath: "/Libraries/foo" } diff --git a/tests/auto/api/testdata/static-lib-deps/project.qbs b/tests/auto/api/testdata/static-lib-deps/project.qbs index 8852a132e..074acc8a5 100644 --- a/tests/auto/api/testdata/static-lib-deps/project.qbs +++ b/tests/auto/api/testdata/static-lib-deps/project.qbs @@ -50,7 +50,7 @@ Project { cpp.defines: ["WITH_SETUPAPI"] } Properties { - condition: qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("macos") cpp.defines: ["WITH_LEX_YACC"] } Properties { @@ -65,7 +65,7 @@ Project { cpp.staticLibraries: ["pthread"] } Properties { - condition: qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("macos") cpp.staticLibraries: ["l", "y"] } Properties { diff --git a/tests/auto/blackbox/testdata/deploymentTarget/deployment.qbs b/tests/auto/blackbox/testdata/deploymentTarget/deployment.qbs index 104bbae81..2abdaeaff 100644 --- a/tests/auto/blackbox/testdata/deploymentTarget/deployment.qbs +++ b/tests/auto/blackbox/testdata/deploymentTarget/deployment.qbs @@ -2,7 +2,7 @@ import qbs CppApplication { files: ["main.c"] - cpp.minimumOsxVersion: "10.4" + cpp.minimumMacosVersion: "10.4" cpp.minimumIosVersion: "5.0" cpp.cFlags: ["-v"] cpp.linkerFlags: ["-v"] diff --git a/tests/auto/blackbox/testdata/ib/assetcatalog/assetcatalogempty.qbs b/tests/auto/blackbox/testdata/ib/assetcatalog/assetcatalogempty.qbs index 2e31c03fc..e79d0dd18 100644 --- a/tests/auto/blackbox/testdata/ib/assetcatalog/assetcatalogempty.qbs +++ b/tests/auto/blackbox/testdata/ib/assetcatalog/assetcatalogempty.qbs @@ -11,7 +11,7 @@ Project { filez.push("empty.xcassets/empty.iconset"); else filez.push("empty.xcassets"); - if (qbs.hostOSVersionMinor >= 10) // need OS X 10.10 to build SBs + if (qbs.hostOSVersionMinor >= 10) // need macOS 10.10 to build SBs filez.push("Storyboard.storyboard"); return filez; } diff --git a/tests/auto/blackbox/testdata/infoplist/infoplist.qbs b/tests/auto/blackbox/testdata/infoplist/infoplist.qbs index a7405b068..58cb361dd 100644 --- a/tests/auto/blackbox/testdata/infoplist/infoplist.qbs +++ b/tests/auto/blackbox/testdata/infoplist/infoplist.qbs @@ -1,6 +1,6 @@ import qbs CppApplication { - cpp.minimumOsxVersion: "10.7" + cpp.minimumMacosVersion: "10.7" files: ["main.c"] } diff --git a/tests/auto/blackbox/testdata/objc-arc/objc-arc.qbs b/tests/auto/blackbox/testdata/objc-arc/objc-arc.qbs index ee2cf6f6b..94dbc451b 100644 --- a/tests/auto/blackbox/testdata/objc-arc/objc-arc.qbs +++ b/tests/auto/blackbox/testdata/objc-arc/objc-arc.qbs @@ -17,5 +17,5 @@ Product { } files: "main.m" - cpp.minimumOsxVersion: "10.6" + cpp.minimumMacosVersion: "10.6" } diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index b6faa585a..7310c03c1 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -54,18 +54,18 @@ using qbs::Internal::removeDirectoryWithContents; using qbs::Profile; using qbs::Settings; -class OsXTarHealer { +class MacosTarHealer { public: - OsXTarHealer() { - if (HostOsInfo::hostOs() == HostOsInfo::HostOsOsx) { - // work around absurd tar behavior on OS X + MacosTarHealer() { + if (HostOsInfo::hostOs() == HostOsInfo::HostOsMacos) { + // work around absurd tar behavior on macOS qputenv("COPY_EXTENDED_ATTRIBUTES_DISABLE", "true"); qputenv("COPYFILE_DISABLE", "true"); } } - ~OsXTarHealer() { - if (HostOsInfo::hostOs() == HostOsInfo::HostOsOsx) { + ~MacosTarHealer() { + if (HostOsInfo::hostOs() == HostOsInfo::HostOsMacos) { qunsetenv("COPY_EXTENDED_ATTRIBUTES_DISABLE"); qunsetenv("COPYFILE_DISABLE"); } @@ -346,7 +346,7 @@ void TestBlackbox::tar() { if (HostOsInfo::hostOs() == HostOsInfo::HostOsWindows) QSKIP("Beware of the msys tar"); - OsXTarHealer tarHealer; + MacosTarHealer tarHealer; QDir::setCurrent(testDataDir + "/archiver"); QString binary = findArchiver("tar"); if (binary.isEmpty()) @@ -540,8 +540,8 @@ public: void TestBlackbox::bundleStructure() { - if (!HostOsInfo::isOsxHost()) - QSKIP("only applies on OS X"); + if (!HostOsInfo::isMacosHost()) + QSKIP("only applies on macOS"); QFETCH(QString, productName); QFETCH(QString, productTypeIdentifier); @@ -921,8 +921,8 @@ void TestBlackbox::dependencyProfileMismatch() void TestBlackbox::deploymentTarget() { - if (!HostOsInfo::isOsxHost()) - QSKIP("only applies on OS X"); + if (!HostOsInfo::isMacosHost()) + QSKIP("only applies on macOS"); QFETCH(QString, os); QFETCH(QString, arch); @@ -950,7 +950,7 @@ void TestBlackbox::deploymentTarget_data() QTest::addColumn<QString>("arch"); QTest::addColumn<QString>("cflags"); QTest::addColumn<QString>("lflags"); - QTest::newRow("osx") << "osx,darwin,bsd,unix" << "x86_64" + QTest::newRow("macos") << "macos,darwin,bsd,unix" << "x86_64" << "-triple x86_64-apple-macosx10.4" << "-macosx_version_min 10.4"; QTest::newRow("ios") << "ios,darwin,bsd,unix" << "arm64" @@ -1038,7 +1038,7 @@ void TestBlackbox::clean() + '/' + QBS_HOST_DYNAMICLIB_PREFIX + "dep"; QString depLibFilePath; QStringList symlinks; - if (qbs::Internal::HostOsInfo::isOsxHost()) { + if (qbs::Internal::HostOsInfo::isMacosHost()) { depLibFilePath = depLibBase + ".1.1.0" + QBS_HOST_DYNAMICLIB_SUFFIX; symlinks << depLibBase + ".1.1" + QBS_HOST_DYNAMICLIB_SUFFIX << depLibBase + ".1" + QBS_HOST_DYNAMICLIB_SUFFIX @@ -1193,7 +1193,7 @@ void TestBlackbox::separateDebugInfo() Profile buildProfile(profileName(), &settings); QStringList toolchain = buildProfile.value("qbs.toolchain").toStringList(); QStringList targetOS = buildProfile.value("qbs.targetOS").toStringList(); - if (targetOS.contains("darwin") || (targetOS.isEmpty() && HostOsInfo::isOsxHost())) { + if (targetOS.contains("darwin") || (targetOS.isEmpty() && HostOsInfo::isMacosHost())) { QVERIFY(directoryExists(relativeProductBuildDir("app1") + "/app1.app.dSYM")); QVERIFY(regularFileExists(relativeProductBuildDir("app1") + "/app1.app.dSYM/Contents/Info.plist")); @@ -2104,8 +2104,8 @@ void TestBlackbox::propertyChanges() void TestBlackbox::qobjectInObjectiveCpp() { - if (!HostOsInfo::isOsxHost()) - QSKIP("only applies on OS X"); + if (!HostOsInfo::isMacosHost()) + QSKIP("only applies on macOS"); const QString testDir = testDataDir + "/qobject-in-mm"; QDir::setCurrent(testDir); QCOMPARE(runQbs(), 0); @@ -2309,7 +2309,7 @@ void TestBlackbox::installPackage() QString binary = findArchiver("tar"); if (binary.isEmpty()) QSKIP("tar not found"); - OsXTarHealer tarHealer; + MacosTarHealer tarHealer; QDir::setCurrent(testDataDir + "/installpackage"); QCOMPARE(runQbs(), 0); const QString tarFilePath = relativeProductBuildDir("tar-package") + "/tar-package.tar.gz"; @@ -2548,8 +2548,8 @@ void TestBlackbox::jsExtensionsProcess() void TestBlackbox::jsExtensionsPropertyList() { - if (!HostOsInfo::isOsxHost()) - QSKIP("temporarily only applies on OS X"); + if (!HostOsInfo::isMacosHost()) + QSKIP("temporarily only applies on macOS"); QDir::setCurrent(testDataDir + "/jsextensions-propertylist"); QbsRunParameters params(QStringList() << "-nf" << "propertylist.qbs"); @@ -3413,8 +3413,8 @@ QString getEmbeddedBinaryPlist(const QString &file) void TestBlackbox::embedInfoPlist() { - if (!HostOsInfo::isOsxHost()) - QSKIP("only applies on OS X"); + if (!HostOsInfo::isMacosHost()) + QSKIP("only applies on macOS"); QDir::setCurrent(testDataDir + QLatin1String("/embedInfoPlist")); @@ -3466,7 +3466,7 @@ void TestBlackbox::enableExceptions_data() QTest::newRow("C++ exceptions, enabled") << "exceptions.qbs" << true << true; QTest::newRow("C++ exceptions, disabled") << "exceptions.qbs" << false << false; - if (HostOsInfo::isOsxHost()) { + if (HostOsInfo::isMacosHost()) { QTest::newRow("Objective-C exceptions, enabled") << "exceptions-objc.qbs" << true << true; QTest::newRow("Objective-C exceptions in Objective-C++ source, enabled") << "exceptions-objcpp.qbs" << true << true; QTest::newRow("C++ exceptions in Objective-C++ source, enabled") << "exceptions-objcpp-cpp.qbs" << true << true; @@ -3486,7 +3486,7 @@ void TestBlackbox::enableRtti() rmDirR(relativeBuildDir()); QCOMPARE(runQbs(params), 0); - if (HostOsInfo::isOsxHost()) { + if (HostOsInfo::isMacosHost()) { params.arguments = QStringList() << "cpp.enableRtti:true" << "project.treatAsObjcpp:true"; rmDirR(relativeBuildDir()); QCOMPARE(runQbs(params), 0); @@ -3498,7 +3498,7 @@ void TestBlackbox::enableRtti() rmDirR(relativeBuildDir()); QVERIFY(runQbs(params) != 0); - if (HostOsInfo::isOsxHost()) { + if (HostOsInfo::isMacosHost()) { params.arguments = QStringList() << "cpp.enableRtti:false" << "project.treatAsObjcpp:true"; rmDirR(relativeBuildDir()); QVERIFY(runQbs(params) != 0); @@ -3507,8 +3507,8 @@ void TestBlackbox::enableRtti() void TestBlackbox::frameworkStructure() { - if (!HostOsInfo::isOsxHost()) - QSKIP("only applies on OS X"); + if (!HostOsInfo::isMacosHost()) + QSKIP("only applies on macOS"); QDir::setCurrent(testDataDir + QLatin1String("/frameworkStructure")); @@ -3662,8 +3662,8 @@ void TestBlackbox::typescript() void TestBlackbox::iconset() { - if (!HostOsInfo::isOsxHost() || !isXcodeProfile(profileName())) - QSKIP("only applies on OS X with Xcode based profiles"); + if (!HostOsInfo::isMacosHost() || !isXcodeProfile(profileName())) + QSKIP("only applies on macOS with Xcode based profiles"); QDir::setCurrent(testDataDir + QLatin1String("/ib/iconset")); @@ -3676,8 +3676,8 @@ void TestBlackbox::iconset() void TestBlackbox::iconsetApp() { - if (!HostOsInfo::isOsxHost() || !isXcodeProfile(profileName())) - QSKIP("only applies on OS X with Xcode based profiles"); + if (!HostOsInfo::isMacosHost() || !isXcodeProfile(profileName())) + QSKIP("only applies on macOS with Xcode based profiles"); QDir::setCurrent(testDataDir + QLatin1String("/ib/iconsetapp")); @@ -3696,8 +3696,8 @@ void TestBlackbox::importingProduct() void TestBlackbox::infoPlist() { - if (!HostOsInfo::isOsxHost()) - QSKIP("only applies on OS X"); + if (!HostOsInfo::isMacosHost()) + QSKIP("only applies on macOS"); QDir::setCurrent(testDataDir + "/infoplist"); @@ -3717,11 +3717,11 @@ void TestBlackbox::assetCatalog() { QFETCH(bool, flatten); - if (!HostOsInfo::isOsxHost() || !isXcodeProfile(profileName())) - QSKIP("only applies on OS X with Xcode based profiles"); + if (!HostOsInfo::isMacosHost() || !isXcodeProfile(profileName())) + QSKIP("only applies on macOS with Xcode based profiles"); if (HostOsInfo::hostOsVersion() < qbs::Internal::Version(10, 9)) - QSKIP("This test needs at least OS X 10.9."); + QSKIP("This test needs at least macOS 10.9."); QDir::setCurrent(testDataDir + QLatin1String("/ib/assetcatalog")); @@ -3741,11 +3741,11 @@ void TestBlackbox::assetCatalog() // empty asset catalogs must still produce output QVERIFY((bool)m_qbsStdout.contains("compiling empty.xcassets")); - // should not produce a CAR since minimumOsxVersion will be < 10.9 + // should not produce a CAR since minimumMacosVersion will be < 10.9 QVERIFY(!regularFileExists(relativeProductBuildDir("assetcatalogempty") + "/assetcatalogempty.app/Contents/Resources/Assets.car")); rmDirR(relativeBuildDir()); - params.arguments.append("cpp.minimumOsxVersion:10.9"); // force CAR generation + params.arguments.append("cpp.minimumMacosVersion:10.9"); // force CAR generation QCOMPARE(runQbs(params), 0); // empty asset catalogs must still produce output @@ -3825,7 +3825,7 @@ void TestBlackbox::assetCatalog_data() void TestBlackbox::objcArc() { - if (!HostOsInfo::isOsxHost()) + if (!HostOsInfo::isMacosHost()) QSKIP("only applies on platforms supporting Objective-C"); QDir::setCurrent(testDataDir + QLatin1String("/objc-arc")); @@ -4016,8 +4016,8 @@ void TestBlackbox::probesInNestedModules() void TestBlackbox::xcode() { - if (!HostOsInfo::isOsxHost() || !isXcodeProfile(profileName())) - QSKIP("only applies on OS X with Xcode based profiles"); + if (!HostOsInfo::isMacosHost() || !isXcodeProfile(profileName())) + QSKIP("only applies on macOS with Xcode based profiles"); QProcess xcodeSelect; xcodeSelect.start("xcode-select", QStringList() << "--print-path"); diff --git a/tests/manual/minimumSystemVersion/minimumSystemVersion.qbs b/tests/manual/minimumSystemVersion/minimumSystemVersion.qbs index 177022381..54fda90a7 100644 --- a/tests/manual/minimumSystemVersion/minimumSystemVersion.qbs +++ b/tests/manual/minimumSystemVersion/minimumSystemVersion.qbs @@ -62,7 +62,7 @@ Project { cpp.minimumWindowsVersion: "5.3" } - // just to make sure three-digit minimum versions work on OS X + // just to make sure three-digit minimum versions work on macOS // this only affects the value of __MAC_OS_X_VERSION_MIN_REQUIRED, // not the actual LC_VERSION_MIN_MACOSX command which is limited to two QtApplication { |