diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2015-07-27 17:35:12 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2015-07-29 19:19:28 +0000 |
| commit | 7eaeb42271399b89725f1edf2d77b43d4f57ac00 (patch) | |
| tree | cc742edc695ceb48b6f8a040767e4bd6707059db /doc | |
| parent | ef5992bb58473bca8c019f2eba9faa0048aa0c05 (diff) | |
Add skeleton Apple watchOS support.
Change-Id: I23569a50a5493e0535ae155925a688b9d5c0743f
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/reference/modules/cpp-module.qdoc | 8 | ||||
| -rw-r--r-- | doc/reference/modules/xcode-module.qdoc | 10 |
2 files changed, 14 insertions, 4 deletions
diff --git a/doc/reference/modules/cpp-module.qdoc b/doc/reference/modules/cpp-module.qdoc index d12396c49..dcf56fd37 100644 --- a/doc/reference/modules/cpp-module.qdoc +++ b/doc/reference/modules/cpp-module.qdoc @@ -433,6 +433,14 @@ \li 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> to the compiler. If undefined, compiler defaults will be used. + \row + \li minimumWatchosVersion + \li \c{string} + \li 1.5 + \li undefined, but may be set by generated profiles + \li A version number in the format [major].[minor] indicating the earliest version of + Apple watchOS that the product should run on. + If undefined, compiler defaults will be used. \endtable \section1 Properties Specific to Unix Platforms diff --git a/doc/reference/modules/xcode-module.qdoc b/doc/reference/modules/xcode-module.qdoc index ac5a36f19..5aa963c7e 100644 --- a/doc/reference/modules/xcode-module.qdoc +++ b/doc/reference/modules/xcode-module.qdoc @@ -63,7 +63,8 @@ \row \li sdk \li string - \li \c{"macosx"} on OS X, \c{"iphoneos"} on iOS, \c{"iphonesimulator"} on iOS Simulator + \li \c{"macosx"} on OS X, \c{"iphoneos"} on iOS, \c{"iphonesimulator"} on iOS Simulator, + \c{"watchos"} on watchOS, \c{"watchsimulator"} on watchOS Simulator \li Version of the Xcode SDK used to build products. This can be specified as a full canonical SDK name (i.e. \c{"macosx10.10"}), a platform version number (i.e. \c{"10.10"}), or a platform identifier (i.e. \c{"macosx"}) in which case the latest SDK @@ -88,9 +89,10 @@ \row \li targetDevices \li stringList - \li \c{["mac"]} on OS X; {["iphone", "ipad"]} on iOS - \li List of the Apple devices targeted by this product. For OS X, this should always be - "mac", and for iOS it can be one or both of "iphone" and "ipad". + \li \c{["mac"]} on OS X; {["iphone", "ipad"]} on iOS; \c{["watch"]} on watchOS + \li List of the Apple devices targeted by this product. For OS X and watchOS, this should + always be "mac" and "watch", respectively, and for iOS it can be one or both of + "iphone" and "ipad". \endtable \section1 Advanced Properties |