aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2022-10-24 14:06:36 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2022-10-24 12:19:52 +0000
commit85cf6f33652d49fd37410ef8988544e9ce1d2ddc (patch)
tree652e641427e14fcf9b99e4a52284d72f3a402c64
parenta459ee5d24302ba33e9b2e0537673aedfba90538 (diff)
Doc: Describe Configuration field in CMake build settings
Update screenshots. Task-number: QTCREATORBUG-27876 Change-Id: Ib0424bef44ac29078a86445da5032011ffc7ff94 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
-rw-r--r--doc/qtcreator/images/qtcreator-build-configurations.pngbin7766 -> 8734 bytes
-rw-r--r--doc/qtcreator/images/qtcreator-project-kits.pngbin29606 -> 40239 bytes
-rw-r--r--doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc4
3 files changed, 4 insertions, 0 deletions
diff --git a/doc/qtcreator/images/qtcreator-build-configurations.png b/doc/qtcreator/images/qtcreator-build-configurations.png
index 8ca5f7054df..ce66706c311 100644
--- a/doc/qtcreator/images/qtcreator-build-configurations.png
+++ b/doc/qtcreator/images/qtcreator-build-configurations.png
Binary files differ
diff --git a/doc/qtcreator/images/qtcreator-project-kits.png b/doc/qtcreator/images/qtcreator-project-kits.png
index e6c1434c9cc..16bf3a0dad0 100644
--- a/doc/qtcreator/images/qtcreator-project-kits.png
+++ b/doc/qtcreator/images/qtcreator-project-kits.png
Binary files differ
diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
index fef25b6ae0f..1b675abe6ec 100644
--- a/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
+++ b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
@@ -15,6 +15,10 @@
settings and displays it in \uicontrol {Initial Configuration} in
the \l{Specifying Build Settings}{Build Settings} of the project.
+ The \uicontrol Configuration field displays the effective CMake call that
+ is constructed by using the values of the \uicontrol {Build directory} and
+ \uicontrol {Build type} fields.
+
\image qtcreator-cmake-build-settings-initial.png "CMake build settings"
\uicontrol {Initial Configuration} lists the variables that are used to