Doc: Fix the path to the Kits options

Kits is now a top-level category in Options, with tabs for
Kits, Qt Versions, Compilers, Debuggers, Qbs, and CMake.

Change-Id: I7f3b37550d47dadb76cb3454cdd4bd0b115eb986
Reviewed-by: hjk <hjk@qt.io>

17 files changed, 57 insertions, 59 deletions

diff --git a/doc/src/baremetal/creator-baremetal-dev.qdoc b/doc/src/baremetal/creator-baremetal-dev.qdoc
index a8bf365036..7df10419fc 100644
--- a/doc/src/baremetal/creator-baremetal-dev.qdoc
+++ b/doc/src/baremetal/creator-baremetal-dev.qdoc
@@ -90,9 +90,9 @@
 
             \endlist
 
-        \li Select \uicontrol Tools > \uicontrol Options >
-            \uicontrol {Build & Run} > \uicontrol Kits > \uicontrol Add to add a
-            kit for building applications and running them on bare metal devices:
+        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
+            \uicontrol Add to add a kit for building applications and running
+            them on bare metal devices:
 
             \image creator-baremetal-kits.png "Bare Metal Device kits"
 
diff --git a/doc/src/cmake/creator-projects-cmake.qdoc b/doc/src/cmake/creator-projects-cmake.qdoc
index 4abbb1d4c0..85b28cb095 100644
--- a/doc/src/cmake/creator-projects-cmake.qdoc
+++ b/doc/src/cmake/creator-projects-cmake.qdoc
@@ -62,8 +62,8 @@
 
     \list 1
 
-        \li Select \uicontrol Tools > \uicontrol Options >
-            \uicontrol {Build & Run} > \uicontrol CMake > \uicontrol Add.
+        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
+            \uicontrol CMake > \uicontrol Add.
 
             \image qtcreator-cmakeexecutable.png
 
diff --git a/doc/src/debugger/creator-debugger-setup.qdoc b/doc/src/debugger/creator-debugger-setup.qdoc
index f851833ba1..a76d61c8d9 100644
--- a/doc/src/debugger/creator-debugger-setup.qdoc
+++ b/doc/src/debugger/creator-debugger-setup.qdoc
@@ -41,8 +41,7 @@
     The main debugger settings are associated with the
     \l{glossary-buildandrun-kit}{kit} you build and run your project with. To
     specify the debugger and compiler to use for each kit, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol {Build and Run} >
-    \uicontrol Kits.
+    \uicontrol Tools > \uicontrol Options > \uicontrol Kits.
 
     You need to set up the debugger only if the automatic setup fails, because
     the native debugger is missing (as is usually the case for the CDB debugger
@@ -57,7 +56,7 @@
     kit for your project.
 
     If the debugger you want to use is not automatically detected, select
-    \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run} >
+    \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
     \uicontrol Debuggers > \uicontrol Add to add it.
 
     \note To use the debugging tools for Windows, you must install them and add
@@ -330,7 +329,7 @@
             \endcode
 
         \li In \QC, select \uicontrol {Qt Creator} > \uicontrol Preferences >
-            \uicontrol {Build & Run} > \uicontrol Kits > \uicontrol Add to
+            \uicontrol Kits > \uicontrol Add to
             create a kit that uses FSF GDB.
 
             \li In the \uicontrol Debugger field, specify the path to FSF GDB
@@ -350,14 +349,14 @@
     \list 1
 
         \li Select \uicontrol Tools > \uicontrol Options >
-            \uicontrol {Build & Run} > \uicontrol Kits.
+            \uicontrol Kits.
 
         \li Select an automatically created kit in the list, and then select
             \uicontrol Clone to create a copy of the kit.
 
         \li In the \uicontrol Debugger field, select an LLDB Engine. If an LLDB
             Engine is not listed, select \uicontrol Manage to add it in
-            \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run} >
+            \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
             \uicontrol Debuggers. For more information, see
             \l {Adding Debuggers}.
 
diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc
index cfa24114f4..7dace43197 100644
--- a/doc/src/linux-mobile/linuxdev.qdoc
+++ b/doc/src/linux-mobile/linuxdev.qdoc
@@ -60,13 +60,13 @@
 
         \li Make sure that your device can be reached via an IP address.
 
-        \li Select \uicontrol {Tools > Options > Build & Run > Qt Versions > Add} to
-            add the Qt version
-            for the embedded Linux.
+        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
+            \uicontrol {Qt Versions} > \uicontrol Add to add the Qt version
+            for embedded Linux.
 
-        \li Select \uicontrol {Tools > Options > Build & Run > Compilers > Add} to
-            add the compiler
-            for building the applications.
+        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
+            \uicontrol Compilers > \uicontrol Add to add the compiler for
+            building the applications.
 
         \li To deploy applications and run them remotely on devices, specify
             parameters for accessing the devices:
@@ -106,9 +106,8 @@
             the SSH port number, which is available in the variable \c %{Device:SshPort}.
 
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run}
-            > \uicontrol Kits > \uicontrol Add to add a kit for building for the device.
-            Select the
+        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
+            \uicontrol Add to add a kit for building for the device. Select the
             Qt version, compiler, and device that you added above, and choose
             \uicontrol {Generic Linux Device} for the device type.
 
diff --git a/doc/src/overview/creator-configuring.qdoc b/doc/src/overview/creator-configuring.qdoc
index f5d5be3267..81b540fdea 100644
--- a/doc/src/overview/creator-configuring.qdoc
+++ b/doc/src/overview/creator-configuring.qdoc
@@ -68,7 +68,7 @@
     yourself to tell \QC where everything is.
 
     To add kits, select \uicontrol Tools > \uicontrol Options >
-    \uicontrol {Build & Run} > \uicontrol Kits > \uicontrol Add.
+    \uicontrol Kits > \uicontrol Add.
 
     For more information, see \l{Adding Kits}.
 
@@ -76,12 +76,12 @@
     \l{glossary-device}{device}, compiler, and Qt version. If you know you have
     installed a Qt
     version, but it is not listed in \uicontrol Tools > \uicontrol Options >
-    \uicontrol {Build & Run} > \uicontrol {Qt Versions}, you must add it.
+    \uicontrol Kits > \uicontrol {Qt Versions}, you must add it.
 
     For more information, see \l{Adding Qt Versions}.
 
     Also check that your compiler is listed in \uicontrol Tools >
-    \uicontrol Options > \uicontrol {Build & Run} > \uicontrol {Compilers}.
+    \uicontrol Options > \uicontrol Kits > \uicontrol {Compilers}.
 
     For more information, see \l{Adding Compilers}.
 
diff --git a/doc/src/overview/creator-glossary.qdoc b/doc/src/overview/creator-glossary.qdoc
index cadd780bb4..29af7ef001 100644
--- a/doc/src/overview/creator-glossary.qdoc
+++ b/doc/src/overview/creator-glossary.qdoc
@@ -97,7 +97,7 @@
                 cross-platform development easier. Each kit consists of a set
                 of values that define one environment, such as a \l{glossary-device}{device},
                 tool chain, Qt version, and debugger command to use. Configure kits at
-                \uicontrol {Tools > Options > Build & Run > Kits}.
+                \uicontrol Tools > \uicontrol Options > \uicontrol Kits.
 
         \row
             \li Mode
diff --git a/doc/src/projects/creator-projects-build-systems.qdocinc b/doc/src/projects/creator-projects-build-systems.qdocinc
index 8771fb693f..e11cf0c340 100644
--- a/doc/src/projects/creator-projects-build-systems.qdocinc
+++ b/doc/src/projects/creator-projects-build-systems.qdocinc
@@ -57,8 +57,9 @@
     To change the location of the project directory, and to specify settings
     for building and running projects, select \uicontrol Tools >
     \uicontrol Options > \uicontrol {Build & Run} > \uicontrol General. The
-    \uicontrol CMake and \uicontrol Qbs tabs contain additional settings for
-    those build systems.
+    \uicontrol CMake tab contains additional settings for CMake. You can find
+    more settings for CMake and Qbs in \uicontrol Tools > \uicontrol Options >
+    \uicontrol Kits > \uicontrol CMake and \uicontrol Qbs.
 
     To specify build and run settings for different target platforms,
     select \uicontrol Projects. For more information on the options you have,
diff --git a/doc/src/projects/creator-projects-compilers.qdoc b/doc/src/projects/creator-projects-compilers.qdoc
index 4ae231b2ca..d6e074d4d2 100644
--- a/doc/src/projects/creator-projects-compilers.qdoc
+++ b/doc/src/projects/creator-projects-compilers.qdoc
@@ -77,14 +77,14 @@
     For QCC, also specify the path to the QNX Software Development Platform (SDP).
 
     You specify the compiler to use for each kit in \uicontrol Tools >
-    \uicontrol Options > \uicontrol {Build & Run} > \uicontrol Kits.
+    \uicontrol Options > \uicontrol Kits.
 
     To add C or C++ compilers:
 
     \list 1
 
         \li Select \uicontrol Tools > \uicontrol Options >
-            \uicontrol {Build & Run} > \uicontrol Compilers > \uicontrol Add,
+            \uicontrol Kits > \uicontrol Compilers > \uicontrol Add,
             then select a compiler in the list, and then select \uicontrol C or
             \uicontrol C++ to add a C or C++ compiler.
 
@@ -116,8 +116,8 @@
 
     \section1 Adding Nim Compilers
 
-    To build an application using the Nim Compiler, select  \uicontrol Tools >
-    \uicontrol Options > \uicontrol {Build & Run} > \uicontrol Compilers >
+    To build an application using the Nim Compiler, select \uicontrol Tools >
+    \uicontrol Options > \uicontrol Kits > \uicontrol Compilers >
     \uicontrol Add > \uicontrol Nim, and specify the path to the directory where
     the compiler is located.
 
@@ -133,7 +133,7 @@
 
     \list 1
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run} >
+        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
             \uicontrol Compilers > \uicontrol Add > \uicontrol Custom >
             \uicontrol C or \uicontrol C++.
 
diff --git a/doc/src/projects/creator-projects-debuggers.qdoc b/doc/src/projects/creator-projects-debuggers.qdoc
index 28fb8e2541..378195ee3b 100644
--- a/doc/src/projects/creator-projects-debuggers.qdoc
+++ b/doc/src/projects/creator-projects-debuggers.qdoc
@@ -45,13 +45,13 @@
     The debugger plugin automatically selects a suitable native debugger for
     each \l{glossary-buildandrun-kit}{kit} from the ones found on your system.
     To override this choice, select \uicontrol Tools > \uicontrol Options >
-    \uicontrol {Build & Run} > \uicontrol Kits.
+    \uicontrol Kits.
 
     To add debuggers:
 
     \list 1
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run} >
+        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
             \uicontrol Debuggers > \uicontrol Add.
 
             \image qtcreator-options-build-run-debuggers.png
diff --git a/doc/src/projects/creator-projects-opening.qdoc b/doc/src/projects/creator-projects-opening.qdoc
index aa9b6e2e5d..2c2ce8c32e 100644
--- a/doc/src/projects/creator-projects-opening.qdoc
+++ b/doc/src/projects/creator-projects-opening.qdoc
@@ -48,15 +48,15 @@
 
     The \uicontrol {Configure Project} tab displays a list of \l{glossary-buildandrun-kit}{kits}
     for building and running projects, that are installed on the development PC and
-    configured in \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run} > \uicontrol Kits.
+    configured in \uicontrol Tools > \uicontrol Options > \uicontrol Kits.
     Select the kits that you want to build and run the project with.
 
     \image qtcreator-open-project-kits.png "Configure Project tab"
 
     Even if you do not intend to build the project, the C++ and QML code models
     need a Qt version and compiler to offer code completion. To specify them,
-    select the \uicontrol Options link, or select \uicontrol {Tools > Options > Build & Run
-    > Kits}.
+    select the \uicontrol Options link, or select \uicontrol Tools >
+    \uicontrol Options > \uicontrol Kits.
 
     If \QC cannot find an existing build for a particular \l{glossary-buildandrun-kit}{kit},
     it starts out
diff --git a/doc/src/projects/creator-projects-qbs.qdoc b/doc/src/projects/creator-projects-qbs.qdoc
index 2abe657f1f..2b0ff26a8a 100644
--- a/doc/src/projects/creator-projects-qbs.qdoc
+++ b/doc/src/projects/creator-projects-qbs.qdoc
@@ -41,7 +41,7 @@
     kit. You can edit the build profiles by adding new keys and values.
 
     To check which Qbs version is being used, select \uicontrol Tools >
-    \uicontrol Options > \uicontrol {Build & Run} > \uicontrol Qbs.
+    \uicontrol Options > \uicontrol Kits > \uicontrol Qbs.
 
     \section1 Building Qbs
 
@@ -60,7 +60,7 @@
     \section1 Specifying Qbs Settings
 
     To specify settings for Qbs, select \uicontrol Tools > \uicontrol Options >
-    \uicontrol {Build & Run} > \uicontrol Qbs.
+    \uicontrol Kits > \uicontrol Qbs.
 
     \image qtcreator-options-qbs.png
 
@@ -73,7 +73,7 @@
     In the \uicontrol Kit field, select a build and run kit to view the
     properties of the associated Qbs profile. To modify the properties of the
     Qbs profile associated with a kit, select \uicontrol Tools >
-    \uicontrol Options > \uicontrol {Build & Run} > \uicontrol Kits. For more
+    \uicontrol Options > \uicontrol Kits. For more
     information, see \l{Editing Qbs Profiles}.
 
     \section1 Related Topics
diff --git a/doc/src/projects/creator-projects-qt-versions.qdoc b/doc/src/projects/creator-projects-qt-versions.qdoc
index bf0f4181b7..01eccaef7b 100644
--- a/doc/src/projects/creator-projects-qt-versions.qdoc
+++ b/doc/src/projects/creator-projects-qt-versions.qdoc
@@ -46,11 +46,12 @@
     your system or by installers. To view detailed information for each Qt
     version, select it in the list and select \uicontrol Details in the
     \uicontrol {Qt version for} section. To add Qt versions, select
-    \uicontrol {Tools > Options > Build & Run > Qt Versions}.
+    \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
+    \uicontrol {Qt Versions}.
 
     You specify the Qt version to use for each \l{glossary-buildandrun-kit}
     {kit} for building and running your projects
-    in \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run} > \uicontrol Kits.
+    in \uicontrol Tools > \uicontrol Options > \uicontrol Kits.
 
     \section1 Setting Up New Qt Versions
 
@@ -58,7 +59,8 @@
 
         \list 1
 
-            \li Select \uicontrol {Tools > Options > Build & Run > Qt Versions > Add}.
+            \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
+                \uicontrol {Qt Versions} > \uicontrol Add.
 
             \li Select the qmake executable for the Qt version that you want to
                 add.
diff --git a/doc/src/projects/creator-projects-settings-overview.qdoc b/doc/src/projects/creator-projects-settings-overview.qdoc
index e9622484af..90c78a612b 100644
--- a/doc/src/projects/creator-projects-settings-overview.qdoc
+++ b/doc/src/projects/creator-projects-settings-overview.qdoc
@@ -60,7 +60,7 @@
     \image qtcreator-project-kits.png
 
     The list displays kits that are configured in \uicontrol Tools >
-    \uicontrol Options > \uicontrol {Build & Run} > \uicontrol Kits. To modify
+    \uicontrol Options > \uicontrol Kits. To modify
     kit configuration or to add kits to the list, right-click the sidebar to
     open a context-menu, and then select \uicontrol {Manage Kits}. For more
     information about managing kits, see \l{Adding Kits}.
diff --git a/doc/src/projects/creator-projects-targets.qdoc b/doc/src/projects/creator-projects-targets.qdoc
index 229bbc196e..963b8ca562 100644
--- a/doc/src/projects/creator-projects-targets.qdoc
+++ b/doc/src/projects/creator-projects-targets.qdoc
@@ -67,8 +67,8 @@
 
     \list 1
 
-        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run}
-            > \uicontrol Kits > \uicontrol Add.
+        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Kits >
+            \uicontrol Add.
 
             \image qtcreator-kits.png
 
@@ -153,7 +153,7 @@
     \section1 Editing Qbs Profiles
 
     To view the Qbs profile associated with the kit, select \uicontrol Tools >
-    \uicontrol Options > \uicontrol {Build & Run} > \uicontrol Qbs.
+    \uicontrol Options > \uicontrol Kits > \uicontrol Qbs.
 
     You can add keys and values to the profile or remove them from it, as well
     as modify existing values. For a list of available keys and values, see
diff --git a/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc b/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc
index eab08b2971..7108460e70 100644
--- a/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc
+++ b/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc
@@ -54,10 +54,9 @@
             click \uicontrol{Next}.
 
             \note Kits are listed if they have been specified in \uicontrol
-            Tools > \uicontrol Options > \uicontrol {Build & Run} >
-            \uicontrol Kits (on Windows and Linux) or in \uicontrol {Qt Creator}
-            > \uicontrol Preferences \uicontrol {Build & Run} > \uicontrol Kits
-            (on \macos).
+            Tools > \uicontrol Options > \uicontrol Kits (on Windows and Linux)
+            or in \uicontrol {Qt Creator} > \uicontrol Preferences >
+            \uicontrol Kits (on \macos).
 
         \li Select \uicontrol Next.
 
diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc
index 0512c3e846..51109a08c2 100644
--- a/doc/src/qtquick/qtquick-creating.qdoc
+++ b/doc/src/qtquick/qtquick-creating.qdoc
@@ -130,8 +130,7 @@
             your project, and then click \uicontrol Next.
 
             \note Kits are listed if they have been specified in
-            \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run} >
-            \uicontrol Kits.
+            \uicontrol Tools > \uicontrol Options > \uicontrol Kits.
 
         \li Review the project settings, and click \uicontrol Finish (on Windows
             and Linux) or \uicontrol Done (on \macos) to create the project.
@@ -173,10 +172,9 @@
             click \uicontrol{Next}.
 
             \note Kits are listed if they have been specified in \uicontrol
-            Tools > \uicontrol Options > \uicontrol {Build & Run} >
-            \uicontrol Kits (on Windows and Linux) or in \uicontrol {Qt Creator}
-            > \uicontrol Preferences \uicontrol {Build & Run} > \uicontrol Kits
-            (on \macos).
+            Tools > \uicontrol Options > \uicontrol Kits (on Windows and Linux)
+            or in \uicontrol {Qt Creator} > \uicontrol Preferences >
+            \uicontrol Kits (on \macos).
 
         \li Select \uicontrol Next.
 
diff --git a/doc/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/src/widgets/qtdesigner-app-tutorial.qdoc
index 12315e7009..2e940a3896 100644
--- a/doc/src/widgets/qtdesigner-app-tutorial.qdoc
+++ b/doc/src/widgets/qtdesigner-app-tutorial.qdoc
@@ -70,9 +70,9 @@
         \li Select build and run \l{glossary-buildandrun-kit}{kits} for your project,
             and click \uicontrol Next or \uicontrol Continue.
 
-            \note If only one kit is specified in \uicontrol Tools > \uicontrol Options >
-            \uicontrol {Build & Run} > \uicontrol Kits (on Windows and Linux) or in
-            \uicontrol {Qt Creator} > \uicontrol Preferences \uicontrol {Build & Run} > \uicontrol Kits
+            \note If only one kit is specified in \uicontrol Tools >
+            \uicontrol Options > \uicontrol Kits (on Windows and Linux) or in
+            \uicontrol {Qt Creator} > \uicontrol Preferences > \uicontrol Kits
             (on \macos), this dialog is skipped.
 
             The \uicontrol{Class Information} dialog opens.