8 files changed, 26 insertions, 20 deletions

diff --git a/src/doc/src/devices/qtee-bd-sl-imx6.qdoc b/src/doc/src/devices/qtee-bd-sl-imx6.qdoc
index 700375c..f321404 100644
--- a/src/doc/src/devices/qtee-bd-sl-imx6.qdoc
+++ b/src/doc/src/devices/qtee-bd-sl-imx6.qdoc
@@ -85,12 +85,12 @@
         \li \b{\B2QA}
         \badcode
             cd <INSTALL_DIR>
-            ./Boot2Qt-3.x/generic-4.2-eAndroid/images/iMX6/deploy.sh /dev/<device_name>
+            ./Boot2Qt-4.x/generic-4.2-eAndroid/images/iMX6/deploy.sh /dev/<device_name>
         \endcode
         \li \b{\B2QL}
         \badcode
             cd <INSTALL_DIR>
-            sudo ./Boot2Qt-3.x/iMX6-eLinux/images/deploy.sh /dev/<device_name>
+            sudo ./Boot2Qt-4.x/iMX6-eLinux/images/deploy.sh /dev/<device_name>
         \endcode
     \endlist
 
diff --git a/src/doc/src/devices/qtee-beagleboard-xm.qdoc b/src/doc/src/devices/qtee-beagleboard-xm.qdoc
index fae5725..17da679 100644
--- a/src/doc/src/devices/qtee-beagleboard-xm.qdoc
+++ b/src/doc/src/devices/qtee-beagleboard-xm.qdoc
@@ -50,7 +50,7 @@
 
     \badcode
         cd <INSTALL_DIR>
-        sudo Boot2Qt-3.x/beagleboard-eLinux/images/deploy.sh /dev/<device_name>
+        sudo Boot2Qt-4.x/beagleboard-eLinux/images/deploy.sh /dev/<device_name>
     \endcode
 
     After the image has been deployed, power on the device and check that
diff --git a/src/doc/src/devices/qtee-beaglebone-black.qdoc b/src/doc/src/devices/qtee-beaglebone-black.qdoc
index 360eb6d..e7316b1 100644
--- a/src/doc/src/devices/qtee-beaglebone-black.qdoc
+++ b/src/doc/src/devices/qtee-beaglebone-black.qdoc
@@ -76,12 +76,12 @@
         \li \b{\B2QA}
         \badcode
             cd <INSTALL_DIR>
-            ./Boot2Qt-3.x/generic-4.2-eAndroid/images/beaglebone/deploy.sh
+            ./Boot2Qt-4.x/generic-4.2-eAndroid/images/beaglebone/deploy.sh
         \endcode
         \li \b{\B2QL}
         \badcode
             cd <INSTALL_DIR>
-            sudo ./Boot2Qt-3.x/beaglebone-eLinux/images/deploy.sh /dev/<device_name>
+            sudo ./Boot2Qt-4.x/beaglebone-eLinux/images/deploy.sh /dev/<device_name>
         \endcode
     \endlist
 
diff --git a/src/doc/src/devices/qtee-nexus-7.qdoc b/src/doc/src/devices/qtee-nexus-7.qdoc
index c461fb6..07d636b 100644
--- a/src/doc/src/devices/qtee-nexus-7.qdoc
+++ b/src/doc/src/devices/qtee-nexus-7.qdoc
@@ -79,12 +79,12 @@
         \li \b{Nexus 7 (2013):}
         \badcode
             cd <INSTALL_DIR>
-            ./Boot2Qt-3.x/generic-X.Y-eAndroid/images/nexus7v2/deploy.sh
+            ./Boot2Qt-4.x/generic-X.Y-eAndroid/images/nexus7v2/deploy.sh
         \endcode
         \li \b{Nexus 7 (2012):}
         \badcode
             cd <INSTALL_DIR>
-            ./Boot2Qt-3.x/generic-X.Y-eAndroid/images/nexus7/deploy.sh
+            ./Boot2Qt-4.x/generic-X.Y-eAndroid/images/nexus7/deploy.sh
         \endcode
     \endlist
 
diff --git a/src/doc/src/devices/qtee-raspberry-pi.qdoc b/src/doc/src/devices/qtee-raspberry-pi.qdoc
index 9a30dce..ff45dff 100644
--- a/src/doc/src/devices/qtee-raspberry-pi.qdoc
+++ b/src/doc/src/devices/qtee-raspberry-pi.qdoc
@@ -54,7 +54,7 @@
 
     \badcode
         cd <INSTALL_DIR>
-        sudo Boot2Qt-3.x/raspberrypi-eLinux/images/deploy.sh /dev/<device_name>
+        sudo Boot2Qt-4.x/raspberrypi-eLinux/images/deploy.sh /dev/<device_name>
     \endcode
 
     After the image has been deployed, insert the SD card, power on the device and check that
diff --git a/src/doc/src/devices/qtee-sabre-sd-imx6quad.qdoc b/src/doc/src/devices/qtee-sabre-sd-imx6quad.qdoc
index 15898c7..e6cbade 100644
--- a/src/doc/src/devices/qtee-sabre-sd-imx6quad.qdoc
+++ b/src/doc/src/devices/qtee-sabre-sd-imx6quad.qdoc
@@ -49,7 +49,7 @@
 
     \badcode
         cd <INSTALL_DIR>
-        sudo Boot2Qt-3.x/imx6qsabresd-eLinux/images/deploy.sh /dev/<device_name>
+        sudo Boot2Qt-4.x/imx6qsabresd-eLinux/images/deploy.sh /dev/<device_name>
     \endcode
 
     After the image has been deployed, insert the SD card, power on the device and check that
diff --git a/src/doc/src/devices/qtee-toradex-apalis.qdoc b/src/doc/src/devices/qtee-toradex-apalis.qdoc
index 4af35c3..3c583f5 100644
--- a/src/doc/src/devices/qtee-toradex-apalis.qdoc
+++ b/src/doc/src/devices/qtee-toradex-apalis.qdoc
@@ -49,7 +49,7 @@
 
     \badcode
         cd <INSTALL_DIR>
-        sudo Boot2Qt-3.x/apalis-imx6-eLinux/images/deploy.sh /dev/<device_name>
+        sudo Boot2Qt-4.x/apalis-imx6-eLinux/images/deploy.sh /dev/<device_name>
     \endcode
 
     By default, the Toradex Apalis iMX6 boots from its internal eMMC. In order to boot from
diff --git a/src/doc/src/qtee-custom-embedded-linux.qdoc b/src/doc/src/qtee-custom-embedded-linux.qdoc
index 36484d2..9b8faf1 100644
--- a/src/doc/src/qtee-custom-embedded-linux.qdoc
+++ b/src/doc/src/qtee-custom-embedded-linux.qdoc
@@ -60,11 +60,18 @@
 
     \section1 Setting Up Yocto Build Environment
 
-    Run the setup script that initializes the Yocto environment:
+    Run the setup script that initializes the Yocto environment. Using Raspberry Pi as
+    an example:
 
     \badcode
     cd <BuildDir>
-    <INSTALL_DIR>/Boot2Qt-3.x/sources/b2qt-yocto-meta/b2qt-init-build-env .
+    <INSTALL_DIR>/Boot2Qt-4.x/sources/b2qt-yocto-meta/b2qt-init-build-env init --device raspberrypi
+    \endcode
+
+    For more command line options, see:
+
+    \badcode
+    <INSTALL_DIR>/Boot2Qt-4.x/sources/b2qt-yocto-meta/b2qt-init-build-env help
     \endcode
 
     \section1 Building the Image and Toolchain
@@ -74,9 +81,8 @@
     an example:
 
     \badcode
-    export TEMPLATECONF=meta-b2qt/conf
     export MACHINE=raspberrypi
-    source poky/oe-init-build-env build-raspberrypi
+    source ./setup-environment.sh
     \endcode
 
     The following table lists the \c MACHINE values for our reference platforms:
@@ -128,7 +134,7 @@
     script. Using Raspberry Pi as an example:
 
     \badcode
-    <INSTALL_DIR>/Boot2Qt-3.x/sources/b2qt-build-scripts/embedded-common/init_build_env.sh <INSTALL_DIR>/Boot2Qt-3.x/sources/b2qt-build-scripts/embedded-linux/config.raspberrypi
+    <INSTALL_DIR>/Boot2Qt-4.x/sources/b2qt-build-scripts/embedded-common/init_build_env.sh <INSTALL_DIR>/Boot2Qt-4.x/sources/b2qt-build-scripts/embedded-linux/config.raspberrypi
     \endcode
 
     \note You can use the same build directory for Qt and the Yocto image.
@@ -137,12 +143,12 @@
     You can use following scripts to build different parts of the \B2Q stack.
 
     \badcode
-    <INSTALL_DIR>/Boot2Qt-3.x/sources/b2qt-build-scripts/embedded-linux/build_qt.sh
-    <INSTALL_DIR>/Boot2Qt-3.x/sources/b2qt-build-scripts/embedded-linux/build_extras.sh
-    <INSTALL_DIR>/Boot2Qt-3.x/sources/b2qt-build-scripts/embedded-linux/build_image.sh
+    ./build_qt.sh
+    ./build_extras.sh
+    ./build_image.sh
     \endcode
 
-    After \e {embedded-linux/build_image.sh} has finished, you can flash the device with
+    After \e {build_image.sh} has finished, you can flash the device with
     the updated image located in the build folder.
 
     \section1 Configuring Qt Creator
@@ -151,7 +157,7 @@
     developing for your device. The following script does this for you.
 
     \badcode
-    <INSTALL_DIR>/Boot2Qt-3.x/sources/b2qt-build-scripts/embedded-common/setup_qtcreator.sh
+    <INSTALL_DIR>/Boot2Qt-4.x/sources/b2qt-build-scripts/embedded-common/setup_qtcreator.sh
     \endcode
 
     This will set up a new kit in Qt Creator, using the toolchain and Qt from