Doc: Update info about Qbs support

Fixes: QTCREATORBUG-23691
Change-Id: Ic1d9b23720a305c39792948aec8f15ee52c1a778
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

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

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -58,8 +58,9 @@
     for building and running projects, select \uicontrol Tools >
     \uicontrol Options > \uicontrol {Build & Run} > \uicontrol General. The
     \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.
+    more settings for CMake in \uicontrol Tools > \uicontrol Options >
+    \uicontrol Kits > \uicontrol CMake and for Qbs in \uicontrol Tools >
+    \uicontrol Options > \uicontrol Qbs.
 
     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-qbs.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -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 Kits > \uicontrol Qbs.
+    \uicontrol Options > \uicontrol Qbs > \uicontrol General.
 
     \section1 Building Qbs
 
@@ -59,22 +59,32 @@
 
     \section1 Specifying Qbs Settings
 
-    To specify settings for Qbs, select \uicontrol Tools > \uicontrol Options >
-    \uicontrol Kits > \uicontrol Qbs.
-
-    \image qtcreator-options-qbs.png
-
     By default, Qbs profiles are stored in the \c qbs directory in the \QC
     settings directory to ensure that different \QC instances do not overwrite
     each other's profiles. If you only run one \QC instance, you can store the
-    profiles in the Qbs settings directory instead, by deselecting the
-    \uicontrol {Store profiles in \QC settings directory} check box.
+    profiles in the Qbs settings directory instead.
 
-    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 Kits. For more
-    information, see \l{Editing Qbs Profiles}.
+    To specify settings for Qbs:
+
+    \list 1
+        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Qbs.
+            \image qtcreator-options-qbs.png
+        \li Deselect the \uicontrol {Use \QC settings directory for Qbs} check
+            box to store Qbs profiles in the Qbs settings directory.
+        \li In the \uicontrol {Path to qbs executable} field, you can view
+            and change the path to the Qbs executable.
+            The \uicontrol {Qbs version} field displays the version number
+            of the executable.
+        \li In the \uicontrol {Default installation directory} field, you
+            can view and change the Qbs installation directory.
+        \li Select the \uicontrol Profiles tab to specify settings for Qbs
+            profiles.
+            \image creator-qbs-profiles.png "Qbs Profiles tab"
+        \li In the \uicontrol Kit field, select a build and run kit to view
+            the properties of the associated profile. To modify the properties,
+            select \uicontrol Tools > \uicontrol Options > \uicontrol Kits.
+            For more information, see \l{Editing Qbs Profiles}.
+    \endlist
 
     \section1 Related Topics
 

doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdocinc

@@ -70,6 +70,13 @@
                 \li Select \uicontrol {Force probes} to force re-execution of
                     the configure scripts of
                     \l{https://doc.qt.io/qbs/probe-item.html}{Probes}.
+                            \li In the \uicontrol Flags field:
+
+            \endlist
+
+        \li In the \uicontrol {Installation flags} field:
+
+            \list
 
                 \li Select \uicontrol Install to copy artifacts to their install
                     location after building them. This option is enabled by

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

@@ -199,7 +199,9 @@
     \section1 Editing Qbs Profiles
 
     To view the Qbs profile associated with the kit, select \uicontrol Tools >
-    \uicontrol Options > \uicontrol Kits > \uicontrol Qbs.
+    \uicontrol Options > \uicontrol Qbs > \uicontrol Profiles.
+
+    \image creator-qbs-profiles.png "Qbs Profiles tab"
 
     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
@@ -214,7 +216,7 @@
             \uicontrol {Additional Qbs Profile Settings} field to open the
             \uicontrol {Custom Properties} dialog.
 
-            \image qtcreator-qbs-profile-settings.
+            \image qtcreator-qbs-profile-settings.png "Custom Properties dialog"
 
         \li Double-click an empty cell in the \uicontrol Key column to specify
             the key to add or modify as: \c <module_name>.<property_name>.