Doc: Update docs after CMake preferences were moved to separate category

...from tabs in Build & Run and Kits categories.

Task-number: QTCREATORBUG-27876
Change-Id: I4f808eaaa32fa978e3ef06d0a3f2a9739d8ef726
Reviewed-by: Cristian Adam <cristian.adam@qt.io>

doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc

@@ -126,10 +126,10 @@
     does not delete the initial configuration.
 
     To be asked before \QC resets the changes, select \uicontrol Edit >
-    \uicontrol Preferences > \uicontrol {Build & Run} > \uicontrol CMake >
+    \uicontrol Preferences > \uicontrol CMake > \uicontrol General >
     \uicontrol {Ask before re-configuring with initial parameters}.
 
-    \image qtcreator-build-run-options-cmake.png "CMake Build & Run options"
+    \image qtcreator-preferences-cmake-general.png "General tab in CMake Preferences"
 
     \section1 Viewing CMake Output
 
@@ -205,8 +205,8 @@
     \QC can automatically set up the \l {Setting Up Conan}
     {Conan package manager} for use with CMake.
 
-    Select \uicontrol Edit > \uicontrol Preferences > \uicontrol {Build & Run} >
-    \uicontrol CMake > \uicontrol {Package manager auto setup} to set the
+    Select \uicontrol Edit > \uicontrol Preferences > \uicontrol CMake
+    \uicontrol General > \uicontrol {Package manager auto setup} to set the
     value of the \c CMAKE_PROJECT_INCLUDE_BEFORE variable to the path to a
     CMake script that installs dependencies from a \c conanfile.txt,
     \c conanfile.py, or \c vcpkg.json file in the project source directory.

doc/qtcreator/src/cmake/creator-projects-cmake.qdoc

@@ -74,10 +74,10 @@
 
     \list 1
 
-        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
-            \uicontrol CMake.
+        \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol CMake >
+            \uicontrol Tools.
 
-            \image qtcreator-cmakeexecutable.png
+            \image qtcreator-preferences-cmake-tools.png "Tools tab in CMake Preferences"
 
         \li The \uicontrol Name field displays a name for the CMake
             installation.
@@ -107,7 +107,8 @@
     To remove the selected CMake executable from the list, select
     \uicontrol Remove.
 
-    Select the \uicontrol Kits tab to add the CMake tool to a build and run kit.
+    To add the CMake tool to a build and run kit, select \uicontrol Edit >
+    \uicontrol Preferences > \uicontrol Kits.
     The kit also specifies the CMake generator that is used for producing
     project files for \QC and the initial configuration parameters:
 

doc/qtcreator/src/projects/creator-only/creator-build-settings-qmake.qdoc

@@ -50,13 +50,13 @@
     > \uicontrol Preferences > \uicontrol {Build & Run} >
     \uicontrol Qmake.
 
-    \image qtcreator-build-settings-qmake.png "qmake build and run options"
+    \image qtcreator-preferences-build-run-qmake.png "Qmake tab in Build & Run Preferences"
 
     To set the default build properties, select \uicontrol Edit
     > \uicontrol Preferences > \uicontrol {Build & Run} >
     \uicontrol {Default Build Properties}.
 
-    \image qtcreator-build-settings-default.png "default build options"
+    \image qtcreator-build-settings-default.png "Default Build Properties tab in Build & Run Preferences"
 
     \section1 Compiling QML
 

doc/qtcreator/src/projects/creator-only/creator-projects-build-systems.qdocinc

@@ -41,11 +41,7 @@
 
     To change the location of the project directory, and to specify settings
     for building and running projects, select \uicontrol Edit >
-    \uicontrol Preferences > \uicontrol {Build & Run} > \uicontrol General. The
-    \uicontrol CMake tab contains additional settings for CMake. You can find
-    more settings for CMake in \uicontrol Edit > \uicontrol Preferences >
-    \uicontrol Kits > \uicontrol CMake and for Qbs in \uicontrol Edit >
-    \uicontrol Preferences > \uicontrol Qbs.
+    \uicontrol Preferences > \uicontrol {Build & Run} > \uicontrol General.
 
     To specify build and run settings for different target platforms,
     select \uicontrol Projects. For more information on the options you have,

doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc

@@ -99,9 +99,11 @@
 
     \QC automatically runs CMake when you make changes to \c {CMakeLists.txt}
     files. To disable this feature, select \uicontrol Edit >
-    \uicontrol Preferences > \uicontrol Kits > \uicontrol CMake. Select the CMake
-    executable to edit, and then deselect the \uicontrol {Autorun CMake} check
-    box.
+    \uicontrol Preferences > \uicontrol CMake > \uicontrol Tools. Select the
+    CMake executable to edit, and then deselect the \uicontrol {Autorun CMake}
+    check box.
+
+    \image qtcreator-preferences-cmake-tools.png "Tools tab in CMake Preferences"
 
     For more information, see \l {Setting Up CMake}.
 
@@ -110,6 +112,10 @@
     To prevent failures on incremental builds, it might make sense
     to always run qmake before building, even though it means that
     building will take more time. To enable this option, select \uicontrol Edit
-    > \uicontrol Preferences > \uicontrol {Build & Run} > \uicontrol qmake >
+    > \uicontrol Preferences > \uicontrol {Build & Run} > \uicontrol Qmake >
     \uicontrol {Run qmake on every build}.
+
+    \image qtcreator-preferences-build-run-qmake.png "qmake tab in Build & Run Preferences"
+
+    For more information, see \l {qmake Build Configuration}.
 */