diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-06-28 01:45:22 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-28 10:18:11 -0700 |
| commit | d17ea24c73b5b58fa6f5d3f00d82de6f53459cfc (patch) | |
| tree | 4cf939e70277190dad948b16849320e4452c5d78 /doc/reference/modules/cpp-module.qdoc | |
| parent | 440d78eca9011d13c88f0e0fd84f62661806eb49 (diff) | |
| parent | 33e9cd462a6c7b6dc552669361f4321ffdb22ff3 (diff) | |
Merge 1.5 into 1.6
Change-Id: If1a2c368170d89d5e6e11b08a32b37901d51eb1d
Diffstat (limited to 'doc/reference/modules/cpp-module.qdoc')
| -rw-r--r-- | doc/reference/modules/cpp-module.qdoc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/doc/reference/modules/cpp-module.qdoc b/doc/reference/modules/cpp-module.qdoc index d8d8425bc..e71269b6c 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 @@ -421,7 +421,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 @@ -437,7 +437,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 |