summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@digia.com>2013-01-24 09:58:00 +0100
committerChristian Kandeler <christian.kandeler@digia.com>2013-01-24 10:52:36 +0100
commit34edc737c70d5567e22f54f222dcb6d7f027d139 (patch)
treedb099b8afb264ed139173daa94469cf8afc7f263
parent9df5373fdc95032f44bc1ec6c18f85f86186cf41 (diff)
downloadqt-creator-34edc737c70d5567e22f54f222dcb6d7f027d139.tar.gz
Doc: deployment settings for generic Linux devices
Change-Id: Id26adb0ea37e258680dd61f9d0b50b8f9c90ef45 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
-rwxr-xr-xdoc/images/qtcreator-run-settings-linux.pngbin0 -> 35992 bytes
-rw-r--r--doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc29
2 files changed, 17 insertions, 12 deletions
diff --git a/doc/images/qtcreator-run-settings-linux.png b/doc/images/qtcreator-run-settings-linux.png
new file mode 100755
index 0000000000..dc609f9d68
--- /dev/null
+++ b/doc/images/qtcreator-run-settings-linux.png
Binary files differ
diff --git a/doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc b/doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc
index 5cec581486..9ba37324d1 100644
--- a/doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc
+++ b/doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc
@@ -1,17 +1,11 @@
\section2 Specifying Run Settings for Linux-Based Devices
- To run an application on a Linux-based device (embedded Linux, MeeGo
- Harmattan, or Maemo), create and select a device configuration in the
- \l{glossary-buildandrun-kit}{kit} that is used for building and running the project and set its
- device type correspondingly.
- You can also pass command line arguments to your application.
-
- \image qtcreator-screenshot-run-settings-maemo.png "Run settings for Linux-based devices"
-
- To run and debug applications on Linux-based devices, you must
- create connections from the development PC to the devices. Click
- \gui {Manage device configurations} to create connections. For more
- information, see \l{Configuring Connections to Maemo Devices},
+ To run and debug an application on a Linux-based device (embedded Linux,
+ MeeGo Harmattan, or Maemo), you must create connections from the development
+ host to the device and add the device configurations to
+ \l{glossary-buildandrun-kit}{kits}. Click \gui {Manage Kits} to add devices
+ to kits. For more information, see
+ \l{Configuring Connections to Maemo Devices},
\l{Configuring Connections to Harmattan Devices}, and
\l {Connecting Embedded Linux Devices}.
@@ -23,3 +17,14 @@
on devices that are of the same type and run the same firmware as the
connected device. For more information, see
\l{Deploying Applications to Linux-Based Devices}.
+
+ For generic embedded Linux devices, the run settings display the path to the
+ executable file on the development host and on the device. To specify that
+ another application launches your application, for example, enter the
+ command in the \gui {Alternate executable on device} field and select the
+ \gui {Use this command instead} check box.
+
+ \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
+ \gui Arguments field.