aboutsummaryrefslogtreecommitdiffstats
path: root/doc/reference
diff options
context:
space:
mode:
Diffstat (limited to 'doc/reference')
-rw-r--r--doc/reference/items/applicationextension.qdoc4
-rw-r--r--doc/reference/items/autotestrunner.qdoc2
-rw-r--r--doc/reference/items/product.qdoc4
-rw-r--r--doc/reference/items/xpcservice.qdoc4
-rw-r--r--doc/reference/jsextensions/jsextension-propertylist.qdoc2
-rw-r--r--doc/reference/modules/bundle-module.qdoc6
-rw-r--r--doc/reference/modules/cpp-module.qdoc16
-rw-r--r--doc/reference/modules/ib-module.qdoc2
-rw-r--r--doc/reference/modules/java-module.qdoc2
-rw-r--r--doc/reference/modules/qbs-module.qdoc2
-rw-r--r--doc/reference/modules/xcode-module.qdoc2
11 files changed, 26 insertions, 20 deletions
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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 17:59:51 +0000