From 95b3ea08f84c2a9bb39179a46952982501c2b2e8 Mon Sep 17 00:00:00 2001 From: Vikas Pachdha Date: Wed, 15 Mar 2017 16:24:37 +0100 Subject: Doc: Add documentation for new iOS variables in qmake manual documentation of QMAKE_DEVELOPMENT_TEAM and QMAKE_PROVISIONING_PROFILE Change-Id: Id5854862e44387e31db40f574d85f88512c27f0c Reviewed-by: Leena Miettinen Reviewed-by: Oswald Buddenhagen --- qmake/doc/src/qmake-manual.qdoc | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'qmake/doc') diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index d8ab7d096d..fbab9f8e25 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. -- cgit v1.2.3 From 710da40ac06278e0d534df5e5d9b6ec8e19640cd Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Tue, 21 Mar 2017 14:33:31 +0100 Subject: Doc: link error in qmake manual MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qmake-manual.qdoc:3226: warning: Can't link to 'system(command[, mode])' Change-Id: I22f7a9a79594d204b67796219bb84a60e76e92b1 Reviewed-by: Topi Reiniö --- qmake/doc/src/qmake-manual.qdoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qmake/doc') diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index fbab9f8e25..2c1e9bfe23 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -3170,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 @@ -3517,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) -- cgit v1.2.3