Doc: Describe Meson Parameters build setting

- Edit the build settings topic for grammar and style.
- Update screenshots.

Task-number: QTCREATORBUG-26610
Change-Id: I168a08921457cd62a013c64c3aaffcffb866626d
Reviewed-by: hjk <hjk@qt.io>

5 files changed, 17 insertions, 16 deletions

diff --git a/doc/qtcreator/images/qtcreator-meson-build-settings.png b/doc/qtcreator/images/qtcreator-meson-build-settings.png
index 6686555054..eee5c3d564 100644
--- a/doc/qtcreator/images/qtcreator-meson-build-settings.png
+++ b/doc/qtcreator/images/qtcreator-meson-build-settings.png
diff --git a/doc/qtcreator/images/qtcreator-meson-build-steps.png b/doc/qtcreator/images/qtcreator-meson-build-steps.png
index 410d6ae059..73e7300a42 100644
--- a/doc/qtcreator/images/qtcreator-meson-build-steps.png
+++ b/doc/qtcreator/images/qtcreator-meson-build-steps.png
diff --git a/doc/qtcreator/images/qtcreator-meson-clean-steps.png b/doc/qtcreator/images/qtcreator-meson-clean-steps.png
index c84aa1d217..f3e3dd2f66 100644
--- a/doc/qtcreator/images/qtcreator-meson-clean-steps.png
+++ b/doc/qtcreator/images/qtcreator-meson-clean-steps.png
diff --git a/doc/qtcreator/src/meson/creator-projects-meson-building.qdoc b/doc/qtcreator/src/meson/creator-projects-meson-building.qdoc
index dcf1a3996e..b592c38d5f 100644
--- a/doc/qtcreator/src/meson/creator-projects-meson-building.qdoc
+++ b/doc/qtcreator/src/meson/creator-projects-meson-building.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -31,19 +31,22 @@
 
     \image qtcreator-meson-build-settings.png "Meson build settings"
 
-    Settings are grouped by category by Meson. All items are user modifiable
-    except \c backend which is forced to Ninja, \c {buildtype}, \c debug as well
-    as \c optimization to ensure a good compatibility with \QC.
+    Meson builds projects in the directory specified in the
+    \uicontrol {Build directory} field.
 
-    Each setting type has its own editor. To modif any setting, double-click it,
-    either edit the field, or select your choice depending on the control. To
-    apply changes, select \uicontrol {Apply configuration changes}. This will
-    trigger a \c {meson configure} command if there were any configuration
-    changes. If for any reason the build directory configuration is broken,
-    select \uicontrol {Wipe project}. This should fix any build directory.
+    Build settings are grouped by category. You can modify all settings,
+    except \c backend, which is forced to Ninja, \c {buildtype}, \c debug,
+    and \c optimization to ensure compatibility with \QC.
 
-    \note Any modified setting will remain in bold until \uicontrol
-    {Apply configuration changes} is selected.
+    To modify a setting, double-click it. Modified settings are formatted in
+    bold until you select \uicontrol {Apply configuration changes} to apply
+    them. This triggers \c {meson configure}. If problems arise, select
+    \uicontrol {Wipe Project} to fix the build directory configuration.
+
+    Meson supports cross-compiling in addition to native building. \QC
+    generates a native build file for you. To use a custom native file or a
+    cross file instead, specify the file name in \uicontrol Parameters.
+    For example, \c {--cross-file cross_file.txt}.
 
     For more information about using Meson, see \l{Setting Up Meson}.
 
@@ -56,8 +59,7 @@
 
     \image qtcreator-meson-build-steps.png "Meson build steps"
 
-    The build errors and warnings are parsed and displayed in the
-    \uicontrol Issues output pane.
+    The build errors and warnings are parsed and displayed in \l Issues.
 
     \section1 Meson Clean Steps
 
diff --git a/doc/qtcreator/src/meson/creator-projects-meson.qdoc b/doc/qtcreator/src/meson/creator-projects-meson.qdoc
index f7865ee225..664c444aa3 100644
--- a/doc/qtcreator/src/meson/creator-projects-meson.qdoc
+++ b/doc/qtcreator/src/meson/creator-projects-meson.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -99,7 +99,6 @@
     The following features are not supported yet:
 
     \list
-        \li Cross compilation.
         \li Showing header files in project tree.
         \li Configuration change detection, for example when building triggers a
         Meson configuration first.