aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2024-05-07 11:16:57 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2024-05-07 09:25:16 +0000
commit1218175c7833e7682201f4f8885fba028c992624 (patch)
treef151b50a6c725410997d56d2d1b21dd937195f19
parentf9b097436b7cea32ce3b1f8fa7538dc48640886b (diff)
Doc: Write "toolchain" as one word
We still have some occurrences in the UI where it is written as two words, though. Change-Id: I245e4185c8ede4313bbe64641f38a3850fa8cbeb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc2
-rw-r--r--doc/qtcreator/src/analyze/creator-analyze.qdoc2
-rw-r--r--doc/qtcreator/src/android/androiddev.qdoc4
-rw-r--r--doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc6
-rw-r--r--doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc2
-rw-r--r--doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc2
-rw-r--r--doc/qtcreator/src/howto/creator-external-tools.qdoc2
-rw-r--r--doc/qtcreator/src/ios/creator-ios-dev.qdoc2
-rw-r--r--doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc2
-rw-r--r--doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc12
-rw-r--r--doc/qtcreator/src/qnx/creator-projects-how-to-run-qnx.qdoc2
-rw-r--r--doc/qtcreator/src/webassembly/creator-webassembly.qdoc6
-rw-r--r--doc/qtcreatordev/src/qtcreator-dev.qdoc2
13 files changed, 23 insertions, 23 deletions
diff --git a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
index 89da6c92ae..1c6ba73efc 100644
--- a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
+++ b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
@@ -456,7 +456,7 @@
\uicontrol {Performance Analyzer Options}. This format is self-contained, and
therefore loading it does not require you to specify the recording
environment. You can transfer such trace files to a different computer
- without any tool chain or debug symbols and analyze them there.
+ without any toolchain or debug symbols and analyze them there.
\section1 Troubleshooting
diff --git a/doc/qtcreator/src/analyze/creator-analyze.qdoc b/doc/qtcreator/src/analyze/creator-analyze.qdoc
index d36ab81ab8..e2333cee77 100644
--- a/doc/qtcreator/src/analyze/creator-analyze.qdoc
+++ b/doc/qtcreator/src/analyze/creator-analyze.qdoc
@@ -65,7 +65,7 @@
\section1 Checking Code Coverage
- Install the \l{https://doc.qt.io/coco/}{Coco} code coverage tool chain for
+ Install the \l{https://doc.qt.io/coco/}{Coco} code coverage toolchain for
Tcl, QML, C# and C/C++ programs on \macOS, Linux, or Windows to analyze the
way an application runs as part of a test suite, for example. Use the
results to make the tests more efficient and complete.
diff --git a/doc/qtcreator/src/android/androiddev.qdoc b/doc/qtcreator/src/android/androiddev.qdoc
index 9258ffb213..3b7a17a6d9 100644
--- a/doc/qtcreator/src/android/androiddev.qdoc
+++ b/doc/qtcreator/src/android/androiddev.qdoc
@@ -56,7 +56,7 @@
\QC offers to automatically install all the necessary packages and tools and
to set up your \l{Qt for Android} development environment by creating
- debuggers, tool chains, and kits.
+ debuggers, toolchains, and kits.
Use \QC to:
@@ -184,7 +184,7 @@
\section1 Add NDK paths
To add custom NDK paths manually to the global list of NDKs, select
- \uicontrol Add. This creates custom tool chains and debuggers associated
+ \uicontrol Add. This creates custom toolchains and debuggers associated
to that NDK.
You have to manually create a kit that uses the custom NDK.
diff --git a/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc b/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc
index 35ca6083ec..3df5faba46 100644
--- a/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc
+++ b/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc
@@ -9,7 +9,7 @@
\title Developing for Bare Metal Devices
- \brief Create kits to use Bare Metal tool chains installed on the computer
+ \brief Create kits to use Bare Metal toolchains installed on the computer
to build applications for and run and debug them on connected Bare Metal
devices.
@@ -18,14 +18,14 @@
\note Enable the Bare Metal plugin to use it.
- Install Bare Metal tool chains on the computer to build applications for
+ Install Bare Metal toolchains on the computer to build applications for
Bare Metal devices. Connect the devices to the computer to run and debug
applications on them.
\note If you use qmake to build the project and the device does not have
Qt libraries, you need a fake Qt installation.
- The following tool chains are supported for building applications:
+ The following toolchains are supported for building applications:
\list
\li GCC: Microchip Technology (AVR, AVR32, PIC16, PIC32),
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc
index 4111c70370..d2836a9c5f 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc
@@ -20,7 +20,7 @@
\QC supports native debuggers for debugging compiled code.
On most supported platforms, you can use the GNU Symbolic Debugger (GDB).
- On Microsoft Windows, when using the Microsoft tool chain, you need the
+ On Microsoft Windows, when using the Microsoft toolchain, you need the
Microsoft Console Debugger (CDB). On \macos and Linux, you can use the LLDB
debugger.
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
index 8cae9932ec..eee91df904 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
@@ -438,7 +438,7 @@
used for building the binary for which the core file was created.
If the core file stems from a binary not built by \QC or a process
not initiated by \QC, select a kit that matches the setup used as
- closely as possible, in respect to the specified device, tool chain,
+ closely as possible, in respect to the specified device, toolchain,
debugger, and sysroot.
\li In \uicontrol {Core file}, specify the core file to inspect.
\li In \uicontrol {Executable of symbol file}, specify
diff --git a/doc/qtcreator/src/howto/creator-external-tools.qdoc b/doc/qtcreator/src/howto/creator-external-tools.qdoc
index 8aef1d66fa..fa58a1e80a 100644
--- a/doc/qtcreator/src/howto/creator-external-tools.qdoc
+++ b/doc/qtcreator/src/howto/creator-external-tools.qdoc
@@ -77,7 +77,7 @@
{build environment} or \l {Specify the run environment}
{run environment} of the active project. Select the build or run
environment if the system environment does not have the necessary
- PATH settings to find the tool chain, for example.
+ PATH settings to find the toolchain, for example.
\else
\li In the \uicontrol {Base environment} field, use the default settings.
\endif
diff --git a/doc/qtcreator/src/ios/creator-ios-dev.qdoc b/doc/qtcreator/src/ios/creator-ios-dev.qdoc
index b01d2dea12..5dccfd1dcc 100644
--- a/doc/qtcreator/src/ios/creator-ios-dev.qdoc
+++ b/doc/qtcreator/src/ios/creator-ios-dev.qdoc
@@ -12,7 +12,7 @@
\brief Connect iOS devices to your local machine with a USB cable to
run applications on them.
- After you install Xcode, \QC automatically detects the tool chain and creates
+ After you install Xcode, \QC automatically detects the toolchain and creates
the necessary \l{Kits}{kits} to build applications for and run them on
configured iOS devices.
diff --git a/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc b/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc
index ac5e1cae6b..2cbac901aa 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc
@@ -77,7 +77,7 @@
\li \QC groups build and run specific settings as kits to make
cross-platform development easier. Each kit consists of a set
of values that define one environment, such as a \e {device},
- tool chain, Qt version, and debugger command to use. Configure kits at
+ toolchain, Qt version, and debugger command to use. Configure kits at
\preferences > \uicontrol Kits.
\row
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc
index 0ec05313fe..8cea15ccbf 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc
@@ -103,7 +103,7 @@
\li Other than the listed compilers and remote compilers.
\endtable
- The emscripten compiler is tool chain for compiling to
+ The emscripten compiler is toolchain for compiling to
\l{Building Applications for the Web}{WebAssembly}.
\section2 Bare-metal compilers
@@ -145,10 +145,10 @@
\endcode
If these commands show paths, they have been added to the global PATH
- variable during the installation of a tool chain based on Cygwin or \MinGW,
+ variable during the installation of a toolchain based on Cygwin or \MinGW,
even though this is against Windows conventions.
- To keep working with the third-party tool chain, create a new shell link
+ To keep working with the third-party toolchain, create a new shell link
that adds the required paths (as Visual Studio and Qt do). The shell link
must point to cmd.exe:
@@ -157,16 +157,16 @@
where the /K parameter carries out the command specified in the bat file.
Create the myenv.bat file at \e path_to, which should be in a convenient
- location. In the file, specify the paths to the tool chains. For example,
+ location. In the file, specify the paths to the toolchains. For example,
\c {set PATH=C:\path1;C:\path2;%PATH%}
- where \e path1 and \e path2 are paths to the tool chains.
+ where \e path1 and \e path2 are paths to the toolchains.
Finally, remove the paths from the global PATH, reboot the computer, and
run the \c where commands again to verify that the global PATH is now clean.
- You can use the shell link to run the tools in the third-party tool chains.
+ You can use the shell link to run the tools in the third-party toolchains.
\sa {Compilers}, {Add Nim compilers}, {Add custom compilers},
{Developing for Bare Metal Devices}, {Supported Platforms}
diff --git a/doc/qtcreator/src/qnx/creator-projects-how-to-run-qnx.qdoc b/doc/qtcreator/src/qnx/creator-projects-how-to-run-qnx.qdoc
index 364ee316bc..c6b41392c9 100644
--- a/doc/qtcreator/src/qnx/creator-projects-how-to-run-qnx.qdoc
+++ b/doc/qtcreator/src/qnx/creator-projects-how-to-run-qnx.qdoc
@@ -18,7 +18,7 @@
\li Select \inlineimage icons/run_small.png (\uicontrol Run).
\endlist
- \QC uses the compiler specified in the QNX tool chain to build the
+ \QC uses the compiler specified in the QNX toolchain to build the
application.
\note Debugging is currently only fully supported on Linux and \macos.
diff --git a/doc/qtcreator/src/webassembly/creator-webassembly.qdoc b/doc/qtcreator/src/webassembly/creator-webassembly.qdoc
index 4a459e8cdd..e4bea34751 100644
--- a/doc/qtcreator/src/webassembly/creator-webassembly.qdoc
+++ b/doc/qtcreator/src/webassembly/creator-webassembly.qdoc
@@ -24,7 +24,7 @@
\note Enable the WebAssembly plugin to use it.
To build applications for the web and run them in a web browser, you need to
- install Qt for WebAssembly and the tool chain for compiling to WebAssembly.
+ install Qt for WebAssembly and the toolchain for compiling to WebAssembly.
\section1 Requirements
@@ -35,12 +35,12 @@
\li Qt for WebAssembly 5.15, or later
\li On Windows: \l{http://wiki.qt.io/MinGW}{\MinGW} 7.3.0, or later
\li \l{https://emscripten.org/docs/introducing_emscripten/index.html}
- {emscripten} tool chain for compiling to WebAssembly
+ {emscripten} toolchain for compiling to WebAssembly
\endlist
\section1 Setting Up the Development Environment
- You need to install and configure Qt for WebAssembly and the tool chain for
+ You need to install and configure Qt for WebAssembly and the toolchain for
compiling to WebAssembly. \QOI automatically adds a build and
run kit to \QC.
diff --git a/doc/qtcreatordev/src/qtcreator-dev.qdoc b/doc/qtcreatordev/src/qtcreator-dev.qdoc
index 368298b31f..ae68f3f407 100644
--- a/doc/qtcreatordev/src/qtcreator-dev.qdoc
+++ b/doc/qtcreatordev/src/qtcreator-dev.qdoc
@@ -138,7 +138,7 @@
Most software projects and development processes require various external
tools. Several external tools, such as popular version control systems and
- build tool chains are integrated into \QC. However, it is impossible for a
+ build toolchains are integrated into \QC. However, it is impossible for a
single tool to cover all the use cases, and therefore you can integrate
additional tools to \QC.