diff options
Diffstat (limited to 'doc/reference/modules')
| -rw-r--r-- | doc/reference/modules/bundle-module.qdoc | 6 | ||||
| -rw-r--r-- | doc/reference/modules/cpp-module.qdoc | 16 | ||||
| -rw-r--r-- | doc/reference/modules/ib-module.qdoc | 2 | ||||
| -rw-r--r-- | doc/reference/modules/java-module.qdoc | 2 | ||||
| -rw-r--r-- | doc/reference/modules/qbs-module.qdoc | 2 | ||||
| -rw-r--r-- | doc/reference/modules/xcode-module.qdoc | 2 |
6 files changed, 18 insertions, 12 deletions
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. |