aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2023-03-03 16:37:58 +0100
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2023-03-06 07:30:08 +0000
commit4c5b4e7ea0ec3398a37a6c82c0e684f95ff6b1d9 (patch)
tree9a33baf6cc789249ed8d47570a53d786e163b065
parent5ea655cabdb9bb883636d4946e238ab78f909fa3 (diff)
Doc: Describe the "cmake --install" deployment step
Task-number: QTCREATORBUG-28721 Change-Id: Id2571cf357e821555ecfa73a78d9b76dd9ee540b Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
-rw-r--r--doc/qtcreator/images/qtcreator-pprunsettings.pngbin13198 -> 0 bytes
-rw-r--r--doc/qtcreator/images/qtcreator-settings-run-desktop.webpbin0 -> 10152 bytes
-rw-r--r--doc/qtcreator/images/qtcreator-settings-run.pngbin24017 -> 0 bytes
-rw-r--r--doc/qtcreator/images/qtcreator-settings-run.webpbin0 -> 19066 bytes
-rw-r--r--doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-desktop.qdocinc11
-rw-r--r--doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc6
6 files changed, 12 insertions, 5 deletions
diff --git a/doc/qtcreator/images/qtcreator-pprunsettings.png b/doc/qtcreator/images/qtcreator-pprunsettings.png
deleted file mode 100644
index dab1d9e1cf..0000000000
--- a/doc/qtcreator/images/qtcreator-pprunsettings.png
+++ /dev/null
Binary files differ
diff --git a/doc/qtcreator/images/qtcreator-settings-run-desktop.webp b/doc/qtcreator/images/qtcreator-settings-run-desktop.webp
new file mode 100644
index 0000000000..989eaee8a7
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-settings-run-desktop.webp
Binary files differ
diff --git a/doc/qtcreator/images/qtcreator-settings-run.png b/doc/qtcreator/images/qtcreator-settings-run.png
deleted file mode 100644
index 3df81e9daf..0000000000
--- a/doc/qtcreator/images/qtcreator-settings-run.png
+++ /dev/null
Binary files differ
diff --git a/doc/qtcreator/images/qtcreator-settings-run.webp b/doc/qtcreator/images/qtcreator-settings-run.webp
new file mode 100644
index 0000000000..b998f92bdb
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-settings-run.webp
Binary files differ
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-desktop.qdocinc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-desktop.qdocinc
index f39a31fb0a..27fe9ade25 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-desktop.qdocinc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-desktop.qdocinc
@@ -10,6 +10,15 @@
and the working directory to use. The working directory defaults to
the directory of the build result.
+ Select \uicontrol {Add Deploy Step} > \uicontrol {CMake Install} to add the
+ \l{https://cmake.org/cmake/help/latest/manual/cmake.1.html#install-a-project}
+ {install} option. It runs installation without using the generated build
+ system or the native build tool. \QC automatically adds the value of the
+ \uicontrol {Working directory} field as the installation directory in the
+ \c {--install} signature.
+
+ \image qtcreator-settings-run-desktop.webp {Run Settings}
+
For console applications, check the \uicontrol{Run in terminal} check box.
To specify the terminal to use on Linux and \macos, select \uicontrol Edit
> \uicontrol Preferences > \uicontrol Environment > \uicontrol System.
@@ -18,8 +27,6 @@
\uicontrol {Run Environment} section. For more information, see
\l {Selecting the Run Environment}.
- \image qtcreator-pprunsettings.png
-
When building an application, \QC creates a list of directories where the
linker will look for libraries that the application links to. By
default, the linked libraries are made visible to the executable that
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc
index 581dcd73e9..6f489f4b30 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc
@@ -21,7 +21,7 @@
To view and modify them, select \uicontrol Projects >
\uicontrol {Build & Run} > \uicontrol Run.
- \image qtcreator-settings-run.png "Run Settings"
+ \image qtcreator-settings-run.webp {Run Settings}
To prevent \QC from automatically creating run configurations, select
\uicontrol Edit > \uicontrol Preferences > \uicontrol {Build & Run},
@@ -104,7 +104,7 @@
You can edit existing environment variables or add, reset and unset new
variables.
- \image qtcreator-run-environment.png "Run Environment section"
+ \image qtcreator-run-environment.png {Run Environment section}
When running on the desktop, the \uicontrol {Build Environment} is used by
default, but you can also use the \uicontrol {System Environment} without the
@@ -130,7 +130,7 @@
Specify the executable to run, command line arguments, working directory,
and environment variables to use.
- \image qmldesigner-run-custom-exe.png "Run settings for custom executables"
+ \image qmldesigner-run-custom-exe.png {Run settings for custom executables}
\include qtquick/creator-projects-settings-run-qtquick.qdocinc run settings qt quick ui
\include python/creator-python-run.qdocinc run settings python