summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2018-10-19 10:37:43 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2018-10-22 11:05:17 +0000
commit0eb8c95c778f6e6c545a4aec397e380710855e5b (patch)
tree4e8437feac58053ff5f81d5b462d8f78b3d707be /doc
parent30b3b1c6e0d01bcf300ab8c619956ff379d613ad (diff)
downloadqt-creator-0eb8c95c778f6e6c545a4aec397e380710855e5b.tar.gz
Doc: Describe selecting the terminal to use on Linux and macOS
Change-Id: I6d1b47f1829ecceef13d1ae23c5d05c22112e94f Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'doc')
-rw-r--r--doc/src/howto/creator-only/qtcreator-faq.qdoc6
-rw-r--r--doc/src/howto/creator-sidebar-views.qdocinc4
-rw-r--r--doc/src/projects/creator-only/creator-projects-settings-run-desktop.qdocinc10
3 files changed, 14 insertions, 6 deletions
diff --git a/doc/src/howto/creator-only/qtcreator-faq.qdoc b/doc/src/howto/creator-only/qtcreator-faq.qdoc
index 5110f7f95e..802164e827 100644
--- a/doc/src/howto/creator-only/qtcreator-faq.qdoc
+++ b/doc/src/howto/creator-only/qtcreator-faq.qdoc
@@ -253,8 +253,10 @@
the standard output and error output. When you run or debug the
application, you can view the output in the \uicontrol{Application Output} pane.
- For console applications that require input, select \uicontrol {Projects > Run
- Settings > Run in terminal}.
+ For console applications that require input, select \uicontrol Projects >
+ \uicontrol {Run Settings} > \uicontrol {Run in terminal}. To specify the
+ terminal to use, select \uicontrol Tools > \uicontrol Options >
+ \uicontrol Environment > \uicontrol System.
\b {On Windows:} Output is displayed differently for \e{console
applications} and \e{GUI applications}.
diff --git a/doc/src/howto/creator-sidebar-views.qdocinc b/doc/src/howto/creator-sidebar-views.qdocinc
index 7ba172b3c3..aaff3986dd 100644
--- a/doc/src/howto/creator-sidebar-views.qdocinc
+++ b/doc/src/howto/creator-sidebar-views.qdocinc
@@ -237,7 +237,9 @@
\li Show the file or directory in the file explorer.
\li Open a terminal window in the selected directory or in the directory
- that contains the file.
+ that contains the file. To specify the terminal to use on Linux and
+ \macos, select \uicontrol Tools > \uicontrol Options >
+ \uicontrol Environment > \uicontrol System.
\li Search from the selected directory.
diff --git a/doc/src/projects/creator-only/creator-projects-settings-run-desktop.qdocinc b/doc/src/projects/creator-only/creator-projects-settings-run-desktop.qdocinc
index 1754af25a9..e0b1c7187e 100644
--- a/doc/src/projects/creator-only/creator-projects-settings-run-desktop.qdocinc
+++ b/doc/src/projects/creator-only/creator-projects-settings-run-desktop.qdocinc
@@ -32,9 +32,13 @@
and the working directory to use. The working directory defaults to
the directory of the build result.
- For console applications, check the \uicontrol{Run in Terminal} check box.
- If you need to run with special environment variables set up, you
- also do it in the run configuration settings.
+ For console applications, check the \uicontrol{Run in terminal} check box.
+ To specify the terminal to use on Linux and \macos, select \uicontrol Tools
+ > \uicontrol Options > \uicontrol Environment > \uicontrol System.
+
+ To run with special environment variables set up, select them in the
+ \uicontrol {Run Environment} section. For more information, see
+ \l {Selecting the Run Environment}.
\image qtcreator-pprunsettings.png