From 9f14000d57a9bf29204eef3fc92ef638da887d7e Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@digia.com>
Date: Tue, 1 Apr 2014 14:11:51 +0200
Subject: Doc: Add documentation on custom build & deploy steps

Add a new subpage for the Build and Run topic, and rename
the top-level page to be more generic.

Change-Id: I09820ecf9f1219491ed08ad4f850b98ec399a0e7
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
Reviewed-by: Riitta-Leena Miettinen <riitta-leena.miettinen@digia.com>
---
 src/doc/src/b2qt.qdoc | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc
index 6b555f5..40b3bc5 100644
--- a/src/doc/src/b2qt.qdoc
+++ b/src/doc/src/b2qt.qdoc
@@ -49,7 +49,10 @@
             \li \l{Preparing BeagleBoard-xM}{BeagleBoard-xM (embedded Linux)}
             \li \l{Preparing Raspberry Pi}{Raspberry Pi Model B (embedded Linux)}
         \endlist
-        \li \l{Building and Running an Example}
+        \li \l{Building and Running Embedded Applications}
+        \list
+            \li \l{Special Build & Run Options}
+        \endlist
         \li \l{Customization}
         \li \l{Building Your Own Embedded Linux Image}
         \li \l{ChangeLog}
@@ -742,9 +745,11 @@
 
 /*!
     \page qtee-building-and-running.html
-    \title Building and Running an Example
+    \title Building and Running Embedded Applications
     \previouspage qtee-preparing-hardware.html
-    \nextpage qtee-customization.html
+    \nextpage qtee-custom-build-steps.html
+
+    \section1 Building and Running an Example
 
     After you complete the installation and configuration steps for \SDK and the
     target devices, you can test the setup by creating a simple \l{Qt Quick}
@@ -819,6 +824,41 @@
     deploying the application binary is all that's required.
 */
 
+/*!
+    \page qtee-custom-build-steps.html
+    \title Special Build & Run Options
+    \previouspage qtee-building-and-running.html
+    \nextpage qtee-customization.html
+
+    Qt Creator allows you to execute custom commands on the embedded device connected
+    to the development host, both during the build process and during deployment of your
+    application.
+
+    \section1 Custom Build Steps
+
+    To add a custom step to be executed during the build:
+
+    \list 1
+        \li In Qt Creator, go to \b Projects > \b {Build Settings}
+        \li Select \b Build configuration for the \e {\B2Q} version you want to customize.
+        \li Click \b {Add Build Step} and select \b {Custom Remote Command (via adb shell)}.
+        \li Enter the command to be executed.
+    \endlist
+
+    \section1 Custom Deployment Steps
+
+    To add a custom step to be executed during deployment:
+
+    \list 1
+        \li In Qt Creator, go to \b Projects > \b {Run Settings}
+        \li Select \b Run configuration for the \e {\B2Q} version you want to customize.
+        \li Click \b {Add Deploy Step} and select \b {Custom Remote Command (via adb shell)}.
+        \li Enter the command to be executed.
+    \endlist
+
+    \sa {Booting to a Custom Application}
+*/
+
 /*!
     \page qtee-customization.html
     \title Customization
@@ -865,8 +905,9 @@
 
     After you have deployed your own application to the device, it will be
     launched on boot, instead of the \B2Q demo launcher. To prevent this
-    behavior, remove the \b {Make this application the default one} step from
-    the \b{Run Settings} for your project in the Qt Creator \b Projects mode.
+    behavior, remove or disable the \b {Make this application the default one}
+    step from the \b{Run Settings} for your project in the Qt Creator \b Projects
+    mode.
 
     To remove your application from the default startup, use the following
     command:
-- 
cgit v1.2.3