Merge remote-tracking branch 'origin/4.14'

Conflicts:
	src/plugins/mcusupport/mcusupportoptions.cpp
	src/plugins/qmldesigner/assetexporterplugin/componentexporter.cpp

Change-Id: I337d1b86f54ad4433a3ed0d73e2011654ef6b950

doc/qtcreator/src/debugger/creator-only/creator-debugger.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.
@@ -843,6 +843,31 @@
     Linux, LLDB on macOS, and CDB on Windows, or any other platform on which at
     least one of the three supported backends is available.
 
+    \section2 Customizing Built-In Debugging Helpers
+
+    You can have commands executed after built-in debugging helpers have
+    been loaded and fully initialized. To load additional debugging helpers or
+    modify existing ones, select \uicontrol Tools > \uicontrol Options >
+    \uicontrol Debugger > \uicontrol {Locals & Expressions}, and enter the
+    commands in the \uicontrol {Debugging Helper Customization} field.
+
+    \image qtcreator-debugging-helper-options.png
+
+    If you receive error messages about receiving signals when using GDB, you
+    can specify \l{https://sourceware.org/gdb/onlinedocs/gdb/Signals.html}
+    {GDB commands} for handling the signals. For example, you can tell GDB to
+    ignore the \c SIGSTOP signal if you receive the following error message:
+    \c {The inferior stopped because it received a signal from the operating
+    system. Signal name: SIGSTOP}.
+
+    To stop GDB from handling the \c SIGSTOP signal, add the following commands
+    to the \uicontrol {Debugging Helper Customization} field:
+
+    \badcode
+    handle SIGSTOP nopass
+    handle SIGSTOP nostop
+    \endcode
+
     \section2 Adding Custom Debugging Helpers
 
     To add debugging helpers for your own types, no compilation is required,
@@ -889,9 +914,6 @@
             \uicontrol Tools > \uicontrol Options > \uicontrol Debugger >
             \uicontrol {Locals & Expressions} >
             \uicontrol {Extra Debugging Helpers}.
-
-            \image qtcreator-debugging-helper-options.png
-
     \endlist
 
     The custom debugging helpers will be automatically picked up from

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
 */

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
 */

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]
+*/

doc/qtdesignstudio/config/qtdesignstudio.qdocconf

@@ -51,6 +51,7 @@ excludedirs  += ../../qtcreator/examples/accelbubble \
                 ../../qtcreator/src/android \
                 ../../qtcreator/src/baremetal \
                 ../../qtcreator/src/cmake \
+                ../../qtcreator/src/conan \
                 ../../qtcreator/src/debugger/creator-only \
                 ../../qtcreator/src/editors/creator-only \
                 ../../qtcreator/src/howto/creator-only \