diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-04 18:08:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-04 18:09:33 +0200 |
| commit | 9419dfe8ee45d08f09c09d3cbece511d721546f0 (patch) | |
| tree | 1c4584099fc1efb8de30cc4526ce7ebafe8a8ce9 /qmake/doc | |
| parent | 8b5aa7b6c40d70a7ec15b3ea485f28a142fb247c (diff) | |
| parent | 8675e1c5ee7d1209784a2320f1ae3f486b1eaae4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
src/plugins/platforms/xcb/qxcbwindow.cpp
Change-Id: Ic747c3c50e68c005b425e7a1ec2a90965527c8bd
Diffstat (limited to 'qmake/doc')
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index ceb93fde2d..4342391809 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -1581,6 +1581,14 @@ qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified. + \target QMAKE_DEVELOPMENT_TEAM + \section1 QMAKE_DEVELOPMENT_TEAM + + \note This variable is used on \macos, iOS, tvOS, and watchOS only. + + The identifier of a development team to use for signing certificates + and provisioning profiles. + \target QMAKE_DISTCLEAN \section1 QMAKE_DISTCLEAN @@ -2076,6 +2084,17 @@ files for IDEs. The default value is the target name. The value of this variable is typically handled by qmake and rarely needs to be modified. + \target QMAKE_PROVISIONING_PROFILE + \section1 QMAKE_PROVISIONING_PROFILE + + \note This variable is used on \macos, iOS, tvOS, and watchOS only. + + The UUID of a valid provisioning profile. Use in conjunction with + \l{QMAKE_DEVELOPMENT_TEAM} to specify the provisioning profile. + + \note Specifying the provisioning profile disables the automatically + managed signing. + \section1 QMAKE_MAC_SDK This variable is used on \macos when building universal binaries. @@ -3151,6 +3170,7 @@ See also \l{fn_size}{size()}. + \target system_replace \section2 system(command[, mode[, stsvar]]) You can use this variant of the \c system function to obtain stdout from the @@ -3498,7 +3518,7 @@ \snippet code/doc_src_qmake-manual.pro 71 - See also the replace variant of \l{system(command[, mode])}{system()}. + See also the replace variant of \l{system_replace}{system()}. \target touchfunction \section2 touch(filename, reference_filename) |