From 6553df4a20f9d8e7fccae9caf6591bb954887c10 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@qt.io>
Date: Thu, 28 Jan 2021 17:17:59 +0100
Subject: [PATCH] Doc: Display info about using Qt Creator variables in QDS
 Manual

They are needed for some more advanced actions.

- Move the section to a .qdocinc file that is included as
  necessary and modify defines where needed.
- Describe using tooltips to get more info about variables.
- Add a screenshot.

Change-Id: Ieb03ccf7de5f0c493c98ae356cdda4b4d3915832
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 doc/qtcreator/images/qtcreator-variables.png  | Bin 0 -> 9575 bytes
 .../src/editors/creator-code-completion.qdoc  |   9 ++-
 ...creator-projects-settings-environment.qdoc |  46 +----------
 .../creator-qtcreator-variables.qdocinc       |  74 ++++++++++++++++++
 4 files changed, 84 insertions(+), 45 deletions(-)
 create mode 100644 doc/qtcreator/images/qtcreator-variables.png
 create mode 100644 doc/qtcreator/src/projects/creator-qtcreator-variables.qdocinc

diff --git a/doc/qtcreator/images/qtcreator-variables.png b/doc/qtcreator/images/qtcreator-variables.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab306c0bca27f241f99a0165e89418e85b478a09
GIT binary patch
literal 9575
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
T-idY$3=9mOu6{1-oD!M<J-ZIL

literal 0
HcmV?d00001

diff --git a/doc/qtcreator/src/editors/creator-code-completion.qdoc b/doc/qtcreator/src/editors/creator-code-completion.qdoc
index c635776fb5b..67d0278b133 100644
--- a/doc/qtcreator/src/editors/creator-code-completion.qdoc
+++ b/doc/qtcreator/src/editors/creator-code-completion.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -218,12 +218,13 @@
     when you write code.
     \if defined(qtcreator)
     Also specify a text string or C++ or QML code construct
-    in the snippet editor, depending on the snippet category. You can use
-    \l{Using Qt Creator Variables}{predefined variables} in snippets.
+    in the snippet editor, depending on the snippet category.
     \else
     Also specify a text string or QML code in the snippet editor, depending on
     the snippet category.
     \endif
+    You can use \l{Using Qt Creator Variables}{predefined variables} in
+    snippets.
 
     The snippet editor provides you with:
 
@@ -319,5 +320,7 @@
     To use Nimsuggest, you must install it on the development PC. Then select
     \uicontrol Tools > \uicontrol Options > \uicontrol Nim > \uicontrol Tools,
     and enter the path to the tool executable in the \uicontrol Path field.
+    \else
+    \include qtcreator-variables.qdocinc qtcreator variables
     \endif
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc
index 5dbdb44b176..f038e900054 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -93,49 +93,11 @@
 
     \section1 Using Environment Variables
 
-    You can use any environment variables to in build, deploy, and run
+    You can use any environment variables in build, deploy, and run
     configurations. For a list of variable names, select \uicontrol {Build
-    Settings} > \uicontrol {Build Environment} > \uicontrol  Details}.
+    Settings} > \uicontrol {Build Environment} > \uicontrol Details.
     Environment variables are referenced using the native syntax: $VARNAME
     or ${VARNAME} on Unix and %VARNAME% on Windows.
 
-    \section1 Using Qt Creator Variables
-
-    You can use \QC variables in arguments, executable paths, and working
-    directories. The variables take care of quoting their expansions, so you do
-    not need to put them in quotes. Select the \inlineimage replace.png
-    (\uicontrol {Variables}) button in a field to select from a list of
-    variables that are available in a particular context.
-
-    The following syntax enables you to use environment variables as \QC
-    variables: %{Env:VARNAME}.
-
-    \QC uses pattern substitution when expanding variable names. To replace the
-    first match of \e pattern within \e variable with \e replacement, use:
-
-    \badcode
-    %{variable/pattern/replacement}
-    \endcode
-
-    To replace all matches of \e pattern within \e variable with \e replacement,
-    use:
-
-    \badcode
-    %{variable//pattern/replacement}
-    \endcode
-
-    The pattern can be a regular expression and the replacement can contain
-    backreferences. For example, if \c %{variable} is \c my123var, then
-    \c %{variable/(..)(\d+)/\2\1} is expanded to \c {123myvar}.
-
-    Instead of the forward slash, you can also use the pound sign (\c #) as
-    the substitution character. This can be helpful if the value is supposed
-    to be a file path, in which case forward slashes might get translated
-    to backslashes on Windows hosts.
-
-    To use the default value if the variable is not set, use:
-
-    \badcode
-    %{variable:-default}
-    \endcode
+    \include qtcreator-variables.qdocinc qtcreator variables
 */
diff --git a/doc/qtcreator/src/projects/creator-qtcreator-variables.qdocinc b/doc/qtcreator/src/projects/creator-qtcreator-variables.qdocinc
new file mode 100644
index 00000000000..65c0fe10bfd
--- /dev/null
+++ b/doc/qtcreator/src/projects/creator-qtcreator-variables.qdocinc
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Creator documentation.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+**
+****************************************************************************/
+
+/*!
+//! [qtcreator variables]
+    \section1 Using Qt Creator Variables
+
+    You can use \QC variables in arguments, executable paths, and working
+    directories. The variables take care of quoting their expansions, so you do
+    not need to put them in quotes.
+
+    Select the \inlineimage replace.png
+    (\uicontrol {Variables}) button in a field to select from a list of
+    variables that are available in a particular context.
+    For more information about each variable, move the cursor over it in the
+    list.
+
+    \image qtcreator-variables.png "Qt Creator Variables dialog displaying a tooltip"
+
+    The following syntax enables you to use environment variables as \QC
+    variables: %{Env:VARNAME}.
+
+    \QC uses pattern substitution when expanding variable names. To replace the
+    first match of \e pattern within \e variable with \e replacement, use:
+
+    \badcode
+    %{variable/pattern/replacement}
+    \endcode
+
+    To replace all matches of \e pattern within \e variable with \e replacement,
+    use:
+
+    \badcode
+    %{variable//pattern/replacement}
+    \endcode
+
+    The pattern can be a regular expression and the replacement can contain
+    backreferences. For example, if \c %{variable} is \c my123var, then
+    \c %{variable/(..)(\d+)/\2\1} is expanded to \c {123myvar}.
+
+    Instead of the forward slash, you can also use the pound sign (\c #) as
+    the substitution character. This can be helpful if the value is supposed
+    to be a file path, in which case forward slashes might get translated
+    to backslashes on Windows hosts.
+
+    To use the default value if the variable is not set, use:
+
+    \badcode
+    %{variable:-default}
+    \endcode
+//! [qtcreator variables]
+*/