aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2020-04-16 16:32:08 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2020-04-20 11:06:29 +0000
commitb7e5362e8fb03a53fd8f2b80c1f60903cc5a7225 (patch)
tree6f7d6ea25da11c114eeb603859facf2ad20b72d2
parentd0e0ffd2d2ad4508bece0ec43c2aa9e56b0d513d (diff)
Doc: Update info about run settings
Task-number: QTCREATORBUG-23364 Change-Id: I5753db6a82e62a371b9d5fb89c01d3ec87676ad3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--doc/qtcreator/images/qmldesigner-run-custom-exe.pngbin14703 -> 16635 bytes
-rw-r--r--doc/qtcreator/images/qmldesigner-run-settings.pngbin15274 -> 4952 bytes
-rw-r--r--doc/qtcreator/images/qtcreator-analyzer-settings.pngbin11815 -> 20907 bytes
-rw-r--r--doc/qtcreator/images/qtcreator-embedded-linux-deployment-overview.pngbin8073 -> 15194 bytes
-rw-r--r--doc/qtcreator/images/qtcreator-pprunsettings.pngbin37170 -> 16858 bytes
-rw-r--r--doc/qtcreator/images/qtcreator-python-run-settings-custom-executable.pngbin4735 -> 7621 bytes
-rw-r--r--doc/qtcreator/images/qtcreator-python-run-settings.pngbin8467 -> 8396 bytes
-rw-r--r--doc/qtcreator/images/qtcreator-run-environment.pngbin31957 -> 28561 bytes
-rw-r--r--doc/qtcreator/images/qtcreator-run-settings-linux.pngbin9505 -> 8497 bytes
-rw-r--r--doc/qtcreator/images/qtcreator-settings-run.pngbin0 -> 31475 bytes
-rw-r--r--doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc4
-rw-r--r--doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdocinc6
-rw-r--r--doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc20
-rw-r--r--doc/qtcreator/src/python/creator-python-run.qdocinc2
-rw-r--r--doc/qtcreator/src/qtquick/creator-projects-settings-run-qtquick.qdocinc6
15 files changed, 24 insertions, 14 deletions
diff --git a/doc/qtcreator/images/qmldesigner-run-custom-exe.png b/doc/qtcreator/images/qmldesigner-run-custom-exe.png
index ec143b5478..c30f6d2185 100644
--- a/doc/qtcreator/images/qmldesigner-run-custom-exe.png
+++ b/doc/qtcreator/images/qmldesigner-run-custom-exe.png
Binary files differ
diff --git a/doc/qtcreator/images/qmldesigner-run-settings.png b/doc/qtcreator/images/qmldesigner-run-settings.png
index c52fd45e50..457a1a9286 100644
--- a/doc/qtcreator/images/qmldesigner-run-settings.png
+++ b/doc/qtcreator/images/qmldesigner-run-settings.png
Binary files differ
diff --git a/doc/qtcreator/images/qtcreator-analyzer-settings.png b/doc/qtcreator/images/qtcreator-analyzer-settings.png
index 2097cb2469..b2c1cdc412 100644
--- a/doc/qtcreator/images/qtcreator-analyzer-settings.png
+++ b/doc/qtcreator/images/qtcreator-analyzer-settings.png
Binary files differ
diff --git a/doc/qtcreator/images/qtcreator-embedded-linux-deployment-overview.png b/doc/qtcreator/images/qtcreator-embedded-linux-deployment-overview.png
index e6e9b26a25..25cdf5c7bf 100644
--- a/doc/qtcreator/images/qtcreator-embedded-linux-deployment-overview.png
+++ b/doc/qtcreator/images/qtcreator-embedded-linux-deployment-overview.png
Binary files differ
diff --git a/doc/qtcreator/images/qtcreator-pprunsettings.png b/doc/qtcreator/images/qtcreator-pprunsettings.png
index f1cd9f6e58..4b53a44d9a 100644
--- a/doc/qtcreator/images/qtcreator-pprunsettings.png
+++ b/doc/qtcreator/images/qtcreator-pprunsettings.png
Binary files differ
diff --git a/doc/qtcreator/images/qtcreator-python-run-settings-custom-executable.png b/doc/qtcreator/images/qtcreator-python-run-settings-custom-executable.png
index 3db0379f57..3ac5fa7bf9 100644
--- a/doc/qtcreator/images/qtcreator-python-run-settings-custom-executable.png
+++ b/doc/qtcreator/images/qtcreator-python-run-settings-custom-executable.png
Binary files differ
diff --git a/doc/qtcreator/images/qtcreator-python-run-settings.png b/doc/qtcreator/images/qtcreator-python-run-settings.png
index d00e8157a2..5d3875f4e3 100644
--- a/doc/qtcreator/images/qtcreator-python-run-settings.png
+++ b/doc/qtcreator/images/qtcreator-python-run-settings.png
Binary files differ
diff --git a/doc/qtcreator/images/qtcreator-run-environment.png b/doc/qtcreator/images/qtcreator-run-environment.png
index 5673ae1b10..515ec87053 100644
--- a/doc/qtcreator/images/qtcreator-run-environment.png
+++ b/doc/qtcreator/images/qtcreator-run-environment.png
Binary files differ
diff --git a/doc/qtcreator/images/qtcreator-run-settings-linux.png b/doc/qtcreator/images/qtcreator-run-settings-linux.png
index 00928cb7b3..14e4d5f969 100644
--- a/doc/qtcreator/images/qtcreator-run-settings-linux.png
+++ b/doc/qtcreator/images/qtcreator-run-settings-linux.png
Binary files differ
diff --git a/doc/qtcreator/images/qtcreator-settings-run.png b/doc/qtcreator/images/qtcreator-settings-run.png
new file mode 100644
index 0000000000..5d0680fbdf
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-settings-run.png
Binary files differ
diff --git a/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc b/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc
index 625666a191..6d2ad9c2e1 100644
--- a/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc
+++ b/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.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.
@@ -43,7 +43,7 @@
You can specify settings for deploying applications to generic Linux devices
in the project .pro file. You can view the settings in the
- \uicontrol {Run Settings}.
+ \uicontrol Projects mode, in \uicontrol {Run Settings}.
\image qtcreator-embedded-linux-deployment-overview.png "Deploy to device"
diff --git a/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdocinc b/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdocinc
index 5ae14681fb..1d64706acf 100644
--- a/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdocinc
+++ b/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.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.
@@ -45,8 +45,8 @@
\image qtcreator-run-settings-linux.png "Run settings for Linux-based devices"
- You can specify command line arguments to pass to your application in the
- \uicontrol Arguments field.
+ You can specify arguments to pass to your application in the
+ \uicontrol {Command line arguments} field.
//! [run settings linux]
*/
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 a67b2052fd..e0d4182379 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
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2019 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.
@@ -44,17 +44,25 @@
To view and modify them, select \uicontrol Projects >
\uicontrol {Build & Run} > \uicontrol Run.
- The available run configurations are listed in the
- \uicontrol {Run configuration} field.
- To add run configurations for a project, select \uicontrol Add.
- To remove the current run configuration, select \uicontrol Remove.
- To rename the current run configuration, select \uicontrol Rename.
+ \image qtcreator-settings-run.png "Run Settings"
To prevent \QC from automatically creating run configurations, select
\uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run},
and then deselect the \uicontrol {Create suitable run configurations
automatically} check box.
+ \section1 Managing Run Configurations
+
+ The available run configurations are listed in the
+ \uicontrol {Run configuration} field.
+ To add run configurations for a project, select \uicontrol Add. To
+ add a run configuration that is based on the current one, select
+ \uicontrol Clone.
+
+ To rename the current run configuration, select \uicontrol Rename.
+
+ To remove the current run configuration, select \uicontrol Remove.
+
The run configurations for qmake projects derive their executable from the
parsed .pro files. For more information on how the commands are constructed,
see \l{Starting External Processes}.
diff --git a/doc/qtcreator/src/python/creator-python-run.qdocinc b/doc/qtcreator/src/python/creator-python-run.qdocinc
index 3062f904eb..af6bd241c8 100644
--- a/doc/qtcreator/src/python/creator-python-run.qdocinc
+++ b/doc/qtcreator/src/python/creator-python-run.qdocinc
@@ -59,7 +59,7 @@
command line arguments to be passed to the executable.
\endlist
- If you want to run some other Python file than \c main.py, create a custom
+ If you want to run some other Python file than \c main.py, create a custom
executable run configuration:
\image qtcreator-python-run-settings-custom-executable.png
diff --git a/doc/qtcreator/src/qtquick/creator-projects-settings-run-qtquick.qdocinc b/doc/qtcreator/src/qtquick/creator-projects-settings-run-qtquick.qdocinc
index 4d1561b47c..3bce00e2bf 100644
--- a/doc/qtcreator/src/qtquick/creator-projects-settings-run-qtquick.qdocinc
+++ b/doc/qtcreator/src/qtquick/creator-projects-settings-run-qtquick.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.
@@ -33,7 +33,9 @@
\list
- \li In the \uicontrol Arguments field, you can specify command line arguments
+ \li In the \uicontrol {QML Viewer} field, specify the \QQV to use.
+
+ \li In the \uicontrol {Command line arguments} field, specify arguments
to be passed to the executable.
\li In the \uicontrol {Main QML file}, select the file that \QQV will be