aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/images/qtcreator-embedded-linux-deployment-details.pngbin0 -> 34098 bytes
-rw-r--r--doc/images/qtcreator-embedded-linux-deployment-overview.pngbin0 -> 28258 bytes
-rw-r--r--doc/images/qtcreator-embedded-linux-deployment.pngbin16244 -> 0 bytes
-rw-r--r--doc/images/qtcreator-maemo-deployment.pngbin17257 -> 0 bytes
-rw-r--r--doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc10
5 files changed, 7 insertions, 3 deletions
diff --git a/doc/images/qtcreator-embedded-linux-deployment-details.png b/doc/images/qtcreator-embedded-linux-deployment-details.png
new file mode 100644
index 00000000000..de40338698b
--- /dev/null
+++ b/doc/images/qtcreator-embedded-linux-deployment-details.png
Binary files differ
diff --git a/doc/images/qtcreator-embedded-linux-deployment-overview.png b/doc/images/qtcreator-embedded-linux-deployment-overview.png
new file mode 100644
index 00000000000..8da85de6531
--- /dev/null
+++ b/doc/images/qtcreator-embedded-linux-deployment-overview.png
Binary files differ
diff --git a/doc/images/qtcreator-embedded-linux-deployment.png b/doc/images/qtcreator-embedded-linux-deployment.png
deleted file mode 100644
index eb015b9f039..00000000000
--- a/doc/images/qtcreator-embedded-linux-deployment.png
+++ /dev/null
Binary files differ
diff --git a/doc/images/qtcreator-maemo-deployment.png b/doc/images/qtcreator-maemo-deployment.png
deleted file mode 100644
index e1692df4e6c..00000000000
--- a/doc/images/qtcreator-maemo-deployment.png
+++ /dev/null
Binary files differ
diff --git a/doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc b/doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc
index 0662f8bb48e..169eb5656b9 100644
--- a/doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc
+++ b/doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc
@@ -35,10 +35,10 @@
You can view the settings in the
\gui {Run Settings}.
- \image qtcreator-maemo-deployment.png "Deploy to device"
+ \image qtcreator-embedded-linux-deployment-overview.png "Deploy to device"
The files to be installed are listed in the \gui {Deployment} step,
- the \gui {Files to install for subproject} field. The \gui {Local File Path}
+ the \gui {Files to deploy} field. The \gui {Local File Path}
field displays the location of the file on the development PC. The
\gui {Remote Directory} field displays the folder where the file is
installed on the device. Text in red color indicates that the information is
@@ -61,7 +61,7 @@
\section1 Deploying on Embedded Linux
- \image qtcreator-embedded-linux-deployment.png "Deploy to embedded Linux"
+ \image qtcreator-embedded-linux-deployment-details.png "Deploy to embedded Linux"
When you run the application on the \gui {Embedded Linux} device,
\QC deploys the application as specified by the deploy steps. By default,
@@ -84,6 +84,10 @@
The \gui {Deploy tarball via SFTP upload} step specifies that \QC
uploads the tarball to the device and extracts it.
+ The \gui {Check for free disk space} step is by default the first deploy step.
+ Use it to find out whether the remote file system has enough space left to deploy your project.
+ Errors due to lack of disk space can otherwise be hard to detect.
+
\note If the SFTP upload fails, make sure that the remote device has
SFTP enabled in its SSH daemon. Some versions of Dropbear that come
without SFTP support will crash when an SFTP upload is being attempted.