Merge remote-tracking branch 'origin/4.3' into master

Change-Id: I83af635dcac98e4fd78b21d8dd9dc3a27a4fdf94

4 files changed, 56 insertions, 8 deletions

diff --git a/doc/images/qtcreator-deployment-steps-b2qt-58.png b/doc/images/qtcreator-deployment-steps-b2qt-58.png
new file mode 100644
index 0000000000..8acc7c55c8
--- /dev/null
+++ b/doc/images/qtcreator-deployment-steps-b2qt-58.png
diff --git a/doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc b/doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc
index 3cd78c322d..53c6bf0694 100644
--- a/doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc
+++ b/doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc
@@ -65,11 +65,11 @@
     on the remote device. Additional files can be deployed by adding them to
     further targets and adding those to \c INSTALLS as well.
 
-    \section1 Deploying on Embedded Linux
+    \section1 Generic Deployment Steps
 
     \image qtcreator-embedded-linux-deployment-details.png "Deploy to embedded Linux"
 
-    When you run the application on the \uicontrol {Embedded Linux} device, \QC
+    When you run the application on the device, \QC
     deploys the application as specified by the deploy steps. 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}
@@ -101,6 +101,45 @@
     support will crash when an SFTP upload is being attempted. This is not a bug
     in \QC.
 
+    \section1 Qt for Device Creation Deployment Steps
+
+    The deployment steps depend on the Qt for Device Creation version specified
+    in the kit.
+
+    \section2 Developing with Qt 5.8 or Earlier
+
+    The generic deployment steps are not available when developing with Qt for
+    Device Creation version 5.8 or earlier.
+
+    \image qtcreator-deployment-steps-b2qt-58.png
+
+    By default, \QC pushes the files to the device incrementally over an ADB
+    connection. When developing on Windows, executable permissions are set for
+    executable files after they are deployed to the device.
+
+    To execute custom commands, select \uicontrol {Add Deploy Step} >
+    \uicontrol {Custom Remote Command (via adb shell)} and enter the command to
+    execute.
+
+    \note You can add custom commands also as \l{Build Steps}{build steps}, to
+    have them executed when the application is built.
+
+    To have your application launch on boot, select \uicontrol {Add Deploy Step}
+    > \uicontrol {Make this application the default one}.
+
+    \section2 Developing with Qt 5.9 or Later
+
+    When developing with Qt for Device Creation version 5.9 or later, you can
+    specify the deployment steps described in this section in addition to the
+    generic deployment steps.
+
+    To execute custom commands when the application is deployed to the device,
+    select \uicontrol {Add Deploy Step} > \uicontrol {Run Custom Remote Command}
+    and enter the command to execute.
+
+    To have your application launch on boot, select \uicontrol {Add Deploy Step}
+    > \uicontrol {Change Default Application}.
+
     \include creator-projects-cmake-deploying.qdocinc cmake deploying embedded
 
 */
diff --git a/doc/src/linux-mobile/creator-projects-settings-run-b2qt.qdocinc b/doc/src/linux-mobile/creator-projects-settings-run-b2qt.qdocinc
index 406cf59e3e..bbbe220a1d 100644
--- a/doc/src/linux-mobile/creator-projects-settings-run-b2qt.qdocinc
+++ b/doc/src/linux-mobile/creator-projects-settings-run-b2qt.qdocinc
@@ -37,14 +37,11 @@
     \l{http://doc.qt.io/QtForDeviceCreation/index.html}{Qt for Device Creation}
     documentation.
 
-    When you run the application, \QC copies the files to the connected device.
-
     The run settings display the path to the executable file on the development
     host and on the device.
 
-    To execute custom commands, select \uicontrol {Add Deploy Step} >
-    \uicontrol {Custom Remote Command (via adb shell)} and enter the command to
-    execute.
+    For more information on the deployment steps, see
+    \l{Deploying Applications to Embedded Linux Devices}.
 
 //! [run settings embedded]
 */
diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc
index 5f303a46ec..1a63026fbc 100644
--- a/doc/src/qtquick/qtquick-creating.qdoc
+++ b/doc/src/qtquick/qtquick-creating.qdoc
@@ -93,6 +93,18 @@
             \uicontrol Application > \uicontrol {Qt Quick Application} >
             \uicontrol Choose.
 
+        \li In the \uicontrol Name field, enter a name for the application.
+
+        \li In the \uicontrol {Create in} field, enter the path for the project
+            files, and then select \uicontrol Next (or \uicontrol Continue on
+            \macos).
+
+        \li In the \uicontrol {Build system} field, select the build system to
+            use for building and running the project: \l qmake,
+            \l {Setting Up CMake}{CMake}, or \l {Setting Up Qbs}{Qbs}.
+
+        \li Select \uicontrol Next.
+
         \li Select the Qt version to
             develop with in the \uicontrol {Minimal required Qt version} field.
             The Qt version determines the Qt Quick imports that are used in the
@@ -104,7 +116,7 @@
             with the UI forms for \QD, it is recommended that you use \QMLD to
             edit the UI forms. For more information, see \l{Qt Quick UI Forms}.
 
-        \li Select \uicontrol Next (or \uicontrol Continue on \macos).
+        \li Select \uicontrol Next.
 
         \li Select \l{glossary-buildandrun-kit}{kits} for running and building
             your project, and then click \uicontrol Next.