diff --git a/doc/qtcreator/images/qtcreator-boot2qt-deployment-steps.png b/doc/qtcreator/images/qtcreator-boot2qt-deployment-steps.png index a1e6741a68e..1e8a355c5b8 100644 Binary files a/doc/qtcreator/images/qtcreator-boot2qt-deployment-steps.png and b/doc/qtcreator/images/qtcreator-boot2qt-deployment-steps.png differ diff --git a/doc/qtcreator/images/qtcreator-embedded-linux-deployment-details.png b/doc/qtcreator/images/qtcreator-embedded-linux-deployment-details.png index 6f7886894d9..f667daf545a 100644 Binary files a/doc/qtcreator/images/qtcreator-embedded-linux-deployment-details.png and b/doc/qtcreator/images/qtcreator-embedded-linux-deployment-details.png differ diff --git a/doc/qtcreator/images/qtcreator-qnx-deployment.png b/doc/qtcreator/images/qtcreator-qnx-deployment.png index 6608e121b67..e338e48f311 100644 Binary files a/doc/qtcreator/images/qtcreator-qnx-deployment.png and b/doc/qtcreator/images/qtcreator-qnx-deployment.png 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 c0b67b7f28e..f26efa1e7bc 100644 --- a/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc +++ b/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc @@ -53,6 +53,11 @@ installed on the device. Text in red color indicates that the information is missing. + If the build system did not automatically detect the source and target + directories, select \uicontrol {Override deployment data from build system}, + and then select \uicontrol Add to enter them manually. To remove the + selected paths from \uicontrol {Files to deploy}, select \uicontrol Remove. + \section1 Adding Missing Files The process to add files to deploy depends on the build system you use. @@ -100,29 +105,17 @@ When you run the application on the device, \QC first uploads the necessary files to it, as specified by the deploy steps. - \section2 Finding Configured Devices - - The \uicontrol {Check for a configured device} step looks for a device that - is ready for deployment. - - \section2 Checking for Free Disk Space - - The \uicontrol {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. This is not a bug - in \QC. - \section2 Uploading Files By default, \QC copies the application files to the device by using the SSH file transfer protocol (SFTP), as specified by the \uicontrol {Upload files via SFTP} step. + \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. This is not a bug + in \QC. + If you have a lot of data to copy, select \uicontrol Details in the \uicontrol {Upload Files via SFTP} step, and then select the \uicontrol {Incremental deployment} check box. \QC takes note of the diff --git a/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc b/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc index 5ec84643126..9580c4cfa0d 100644 --- a/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc +++ b/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc @@ -48,4 +48,9 @@ The deployment process is described in more detail in \l{Deploying Applications to Generic Remote Linux Devices}. + + \section1 Finding Configured Devices + + The \uicontrol {Check for a configured device} deployment step looks for a + device that is ready for deployment. */