summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@digia.com>2014-07-30 12:03:01 +0200
committerLeena Miettinen <riitta-leena.miettinen@digia.com>2014-07-31 11:49:16 +0200
commitb20b1d3378b55f2b4f48c5d3ef04deb4dac863fc (patch)
tree2d82ea24d4bfc43ad7694323c2a848083308b9e7 /doc
parente9e405cb18e0d7ed7a177fa6d67c2774c2113bfa (diff)
downloadqt-creator-b20b1d3378b55f2b4f48c5d3ef04deb4dac863fc.tar.gz
Doc: make the running instructions be about kit selector
Remove the section about running on desktop and add instructions for opening the kit selector. Update the screen shot. Change-Id: I164381287bd2167eb45dd6b4c2c3da555027af12 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/images/qtcreator-kit-selector.pngbin24369 -> 39125 bytes
-rw-r--r--doc/src/projects/creator-projects-running-desktop.qdocinc11
-rw-r--r--doc/src/projects/creator-projects-running.qdoc22
3 files changed, 18 insertions, 15 deletions
diff --git a/doc/images/qtcreator-kit-selector.png b/doc/images/qtcreator-kit-selector.png
index 4319cb32a4..dcd53f7fa9 100644
--- a/doc/images/qtcreator-kit-selector.png
+++ b/doc/images/qtcreator-kit-selector.png
Binary files differ
diff --git a/doc/src/projects/creator-projects-running-desktop.qdocinc b/doc/src/projects/creator-projects-running-desktop.qdocinc
deleted file mode 100644
index 5782622658..0000000000
--- a/doc/src/projects/creator-projects-running-desktop.qdocinc
+++ /dev/null
@@ -1,11 +0,0 @@
- \section1 Running on Desktop
-
- \list 1
-
- \li Select \gui Desktop as the build and run \l{glossary-buildandrun-kit}{kit}.
-
- \image qtcreator-kit-selector.png "Kit selector"
-
- \li Click the \gui Run button.
-
- \endlist
diff --git a/doc/src/projects/creator-projects-running.qdoc b/doc/src/projects/creator-projects-running.qdoc
index 534bec7690..48d7866f64 100644
--- a/doc/src/projects/creator-projects-running.qdoc
+++ b/doc/src/projects/creator-projects-running.qdoc
@@ -34,14 +34,28 @@
location from where it can be run on the desktop, on a device emulator or
simulator, or on a mobile device that is connected to the development PC.
- To run executable files without deploying them first, deselect the
- \gui {Tools > Options > Project > Always deploy project before running it}
- option.
+ To run executable files without deploying them first, select \gui Build >
+ \gui {Run Without Deployment}. To make this the default option, deselect the
+ \gui Tools > \gui Options > \gui Project >
+ \gui {Always deploy project before running it} option.
+
+ To run applications:
+
+ \list 1
+
+ \li Click the \gui {Build and Run Kit Selector} icon (1) or select
+ \gui Build > \gui {Open Build and Run Kit Selector} to select the
+ build and run \l{glossary-buildandrun-kit}{kit}.
+
+ \image qtcreator-kit-selector.png "Kit selector"
+
+ \li Click the \gui Run button (2).
+
+ \endlist
For more information on the options you have, see
\l{Specifying Run Settings}.
- \include projects/creator-projects-running-desktop.qdocinc
\include linux-mobile/creator-projects-running-generic-linux.qdocinc
\include qnx/creator-projects-running-qnx.qdocinc
*/