Merge remote-tracking branch 'origin/5.6' into dev

* origin/5.6:
  Doc: ChangeLog for 5.6.0
  Doc: Fix small inconsistency for tree element separator.
  Doc: Update which Yocto release is used.
  Doc: Clarify GPU options in i.MX6 boards
  Doc: Also support Windows as a development host system.
  Doc: Remove duplicated file.
  Revert "Device settings UI."
  Doc: Add note about resetting U-Boot env.
  doc: update toradex u-boot commands
  doc: update kontron board instructions
  doc: update yocto documentation
  Doc: List the 3rdparty components used by the Qt add-ons

Change-Id: I7850f35fb8f80052517f2e624f0afca61f108a4b

17 files changed, 206 insertions, 122 deletions

diff --git a/src/doc/src/detect-sd-card-device-name.qdocinc b/src/doc/src/detect-sd-card-device-name.qdocinc
deleted file mode 100644
index dbc1a64..0000000
--- a/src/doc/src/detect-sd-card-device-name.qdocinc
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use the contact form at
-** http://www.qt.io
-**
-** This file is part of Qt Enterprise Embedded.
-**
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** the contact form at http://www.qt.io
-**
-****************************************************************************/
-/*!
-//! [instructions]
-    Plug in the SD card or reader to the development host,
-    and use the following command to find out its device name:
-
-    \badcode
-        lsblk -d
-    \endcode
-
-    Removable devices such as SD cards have the value '1' in
-    the \e RM column.
-
-    \warning Make sure to select the correct device, because selecting
-    the wrong one can result in a wiped hard drive.
-
-    Typical device names for SD cards include \c {sdb} and
-    \c {mmcblk0}. The full device path is \c {/dev/} followed by
-    the name.
-//! [instructions]
-
-//! [unmount]
-    \badcode
-        umount /dev/<device_name>
-    \endcode
-//! [unmount]
-
-*/
diff --git a/src/doc/src/devices/qtee-bd-sl-imx6.qdoc b/src/doc/src/devices/qtee-bd-sl-imx6.qdoc
index 8ef2e8a..6aa39ac 100644
--- a/src/doc/src/devices/qtee-bd-sl-imx6.qdoc
+++ b/src/doc/src/devices/qtee-bd-sl-imx6.qdoc
@@ -88,6 +88,15 @@
         run upgradeu
     \endcode
 
+    Reset or power cycle the device to start the new U-Boot.
+    To reset the U-Boot environment to new default values, enter the following commands
+    in the U-Boot command line
+
+    \badcode
+        env default -a
+        saveenv
+    \endcode
+
     \b {Setup for Nitrogen6_Lite Device}
 
     The boot script requires the environment variables, \c dtbname and \c gpumem, to identify
diff --git a/src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc b/src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc
index de493b6..a576faf 100644
--- a/src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc
+++ b/src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc
@@ -65,7 +65,7 @@
         setenv bootcmd 'mmc dev ${mmcdev}; if mmc rescan; then if run loadfdt; then if run loaduimage; then run mmcboot; else run netboot; fi; else run netboot; fi; else run netboot; fi;'
         setenv uimage /boot/uImage
         setenv fdtfile /boot/imx6q-smx6-lcd.dtb
-        setenv mmcroot /dev/mmcblk0p2 rootwait rw
+        setenv mmcroot /dev/mmcblk2p2 rootwait rw
         setenv mmcargs 'setenv bootargs video=mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 fbmem=28M console=${console},${baudrate} root=${mmcroot}'
         saveenv
     \endcode
diff --git a/src/doc/src/devices/qtee-supported-devices.qdoc b/src/doc/src/devices/qtee-supported-devices.qdoc
index 360c940..b78449e 100644
--- a/src/doc/src/devices/qtee-supported-devices.qdoc
+++ b/src/doc/src/devices/qtee-supported-devices.qdoc
@@ -137,7 +137,7 @@
     \row \li \l{http://boundarydevices.com/product-selector-guide/}
             {Boundary Devices i.MX6 Boards}\br
             Freescale® i.MX 6 based devices with\br
-            Vivante GC2000 GPU
+            Vivante GC880 or GC2000 GPU
     \row \li \l{http://www.silica.com/product/architech-tibidabo.html}
             {SILICA ArchiTech Tibidabo}\br
             Freescale® i.MX 6Q ARM Cortex™-A9 @800 MHz,\br
diff --git a/src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc b/src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc
index 6b96c09..e6ce7d9 100644
--- a/src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc
+++ b/src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc
@@ -60,9 +60,6 @@
     Enter following commands into U-Boot:
 
     \badcode
-        setenv drive 2
-        setenv setupdate 'fatload mmc ${drive}:1 ${loadaddr} flash_mmc.img; source'
-
         run setupdate
         run update_uboot
     \endcode
diff --git a/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc b/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc
index fbf1f37..56fb0f5 100644
--- a/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc
+++ b/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc
@@ -67,6 +67,18 @@
     \endcode
 
     Reset or power cycle the device to continue.
+    To reset the U-Boot environment to new default values, enter the following commands
+    in the U-Boot command line
+
+    \badcode
+        env default -a
+        saveenv
+    \endcode
+
+
+    New U-Boot commands are now stored into the device, and you can start \B2Q. For more information
+    about the boot process on Toradex Colibri iMX6, see
+    \l{http://developer.toradex.com/software-resources/arm-family/linux/linux-booting}{Toradex Linux Booting}.
 
     After the image has been deployed, insert the SD card, power on the device and check that
     the \B2Q welcome screen and/or demo appear.
diff --git a/src/doc/src/qtee-changelog.qdoc b/src/doc/src/qtee-changelog.qdoc
index 98358c7..5e96d45 100644
--- a/src/doc/src/qtee-changelog.qdoc
+++ b/src/doc/src/qtee-changelog.qdoc
@@ -23,9 +23,50 @@
     \previouspage qtee-customization.html
     \nextpage qtee-troubleshooting.html
 
+    \section1 Boot to Qt 5.6.0
+
+    \b{New Features}:
+    \list
+        \li \B2Q stack was updated to use Qt 5.6.0.
+        \li The entire stack is now built with Yocto tooling,
+            using the \e meta-qt5 layer for the Qt modules.
+        \li \B2Q build scripts are no longer available for
+            building custom images.
+        \li \l {Qt Charts} was updated to version 2.1.0.
+        \li \l {Qt Data Visualization} was updated to version 1.2.2.
+        \li \l {Qt Quick Compiler} was updated to version 4.0.0.
+        \li \l {Qt Virtual Keyboard} was updated to version 2.0.0.
+        \li \l {Qt Quick 2D Renderer} was updated to version 5.6.0.
+        \li Added Windows development host support as Technical Preview.
+    \endlist
+
+    \b{Improvements}:
+    \list
+        \li Moved to use Yocto 1.8 (Fido).
+        \li Enabled touch screen support (RPi-FT5406 driver) in the Raspberry
+            Pi 2 image.
+        \li Improved \e {About Qt for Device Creation} demo.
+        \li Added a new demo, \e {Web Browser}, demonstrating the use of
+            Qt WebEngine with Qt Quick.
+        \li New style and improved visuals for the demo launcher.
+        \li Toradex Colibri VF: Included \e mqxboot utility in the prebuilt
+            images, enabling the bootup process of the secondary Cortex-M4
+            core from user-space.
+        \li Toradex BSP was updated to V2.5Beta3_20151215.
+        \li Enabled High-DPI support for the emulator.
+    \endlist
+
+    \b{Fixed Bugs}:
+    \list
+        \li Nitrogen6X: Fixed performance issues for Qt WebEngine video playback.
+        \li Fixed \e {can't find linker symbol for virtual table} warnings when
+            debugging Qt Quick applications.
+    \endlist
+
     \section1 Boot to Qt 5.5.1
     \list
         \li Release date: Sep 24, 2015
+        \li Supported until: Mar 16, 2018
     \endlist
 
     \b{New Features}:
@@ -211,7 +252,7 @@
             style for the virtual keyboard.
         \li Made the \e {Display FPS} option in \e {Launcher Settings}
             persistent.
-        \li Updated the \e {Qt 5 Everywhere} demo.
+        \li Updated the \e {Qt 5 Everywhere} demo.
     \endlist
 
     \b {Fixed Bugs}:
diff --git a/src/doc/src/qtee-custom-embedded-linux.qdoc b/src/doc/src/qtee-custom-embedded-linux.qdoc
index 5d2a577..c08c7ed 100644
--- a/src/doc/src/qtee-custom-embedded-linux.qdoc
+++ b/src/doc/src/qtee-custom-embedded-linux.qdoc
@@ -51,8 +51,7 @@
             \e {Package Manager}. The \e {Yocto meta layer} package
             contains the additional recipes required to make the image
             compatible with \B2Q.
-        \li Install the dependencies for the Yocto tools, build
-            scripts, and the Qt modules. In Ubuntu, the following
+        \li Install the dependencies for the Yocto tools. In Ubuntu, the following
             packages are required:
             \badcode
             sudo apt-get install gawk wget git-core diffstat unzip p7zip-full texinfo \
@@ -68,7 +67,7 @@
 
     \badcode
     cd <BuildDir>
-    <INSTALL_DIR>/5.6/Boot2Qt/sources/b2qt-yocto-meta/b2qt-init-build-env init --device imx6qsabresd
+    <INSTALL_DIR>/5.6/Boot2Qt/sources/meta-b2qt/b2qt-init-build-env init --device imx6qsabresd
     \endcode
 
     \c b2qt-init-build-env has the following additional command line options:
@@ -81,7 +80,7 @@
     For all command line options, see:
 
     \badcode
-    <INSTALL_DIR>/5.6/Boot2Qt/sources/b2qt-yocto-meta/b2qt-init-build-env help
+    <INSTALL_DIR>/5.6/Boot2Qt/sources/meta-b2qt/b2qt-init-build-env help
     \endcode
 
     \note Support for Kontron SMARC-sAMX6i requires additional Yocto Board Support Package that is
@@ -142,57 +141,36 @@
     \endtable
 
     Yocto recipes for \B2QL have two main targets to build: The target image,
-    and the external toolchain that is used for building the Qt framework and
-    applications.
+    and the external toolchain that can be used with Qt Creator for building Qt applications.
 
     \badcode
-    bitbake b2qt-embedded-image
-    bitbake meta-toolchain-b2qt-embedded-sdk
+    bitbake b2qt-embedded-qt5-image
+    bitbake meta-toolchain-b2qt-embedded-qt5-sdk
     \endcode
 
-    The target rootfs image is located in the \c <YoctoBuildDir>/tmp/deploy/images/<target>/b2qt-embedded-image-<target>.tar.gz,
-    and the new toolchain is in \c <YoctoBuildDir>/tmp/deploy/sdk/b2qt-eglibc-x86_64-meta-toolchain-b2qt-embedded-sdk-<target-architecture>-toolchain-1.6.sh
-
-    \note The generated target image does not yet include Qt libraries,
-    you need to build Qt and add it into the image yourself.
-
-    \section1 Building Qt and Addons
-
-    \e {Build scripts} source package contains scripts that can be used to
-    build Qt and all additional Qt addons that are part of \B2QL image.
-    To setup build environment for your target hardware, run the initialization
-    script. For example:
-
-    \badcode
-    <INSTALL_DIR>/5.6/Boot2Qt/sources/b2qt-build-scripts/embedded-common/init_build_env.sh <INSTALL_DIR>/5.6/Boot2Qt/sources/b2qt-build-scripts/embedded-linux/config.imx6qsabresd
-    \endcode
-
-    \note You can use the same build directory for Qt and the Yocto image.
-    The toolchain and the target image are then used from the Yocto build directory.
-
-    You can use following scripts to build different parts of the \B2Q stack.
-
-    \badcode
-    ./build_qt.sh
-    ./build_extras.sh
-    ./build_image.sh
-    \endcode
-
-    After \e {build_image.sh} has finished, you can write the updated image to your SD card:
-    \badcode
-    sudo ./deploy.sh /dev/<device_name>
-    \endcode
+    The target rootfs image is located in the \c <YoctoBuildDir>/tmp/deploy/images/<target>/b2qt-embedded-qt5-image-<target>.img,
+    and the new toolchain is in \c <YoctoBuildDir>/tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-embedded-qt5-sdk-<target>.sh
 
     \section1 Configuring Qt Creator
 
-    After you have built the \B2Q stack, you must also set up Qt Creator in order to start
+    Once the toolchain is built, you can install it by running the generated \c .sh script.
+    After you have built and installed the toolchain, you must also set up Qt Creator in order to start
     developing for your device. The following script does this for you.
 
     \badcode
-    <INSTALL_DIR>/5.6/Boot2Qt/sources/b2qt-build-scripts/embedded-common/setup_qtcreator.sh
+    <TOOLCHAIN_DIR>/configure-qtcreator.sh
     \endcode
 
     This will set up a new kit in Qt Creator, using the toolchain and Qt from
-    your build directory. The new kit is visible under \b Tools > \b Options
+    the installed toolchain. The new kit is visible under \b Tools > \b Options
     > \b {Build & Run} > \b Kits.
+
+    \section1 Using Toolchain without Qt Creator
+
+    The toolchain can be also used without Qt Creator. qmake, which can be used
+    directly for building Qt application, is located in \c sysroots/x86_64-pokysdk-linux/usr/bin/qmake.
+
+    To use the toolchain for more generic cross-development, you need to set up the environment by
+    sourcing the environment setup script from the toolchain. For more information, see the Yocto Project
+    \l {http://www.yoctoproject.org/docs/latest/mega-manual/mega-manual.html#setting-up-the-cross-development-environment}{documentation}.
 */
diff --git a/src/doc/src/qtee-customization.qdoc b/src/doc/src/qtee-customization.qdoc
index 5604375..68f1b7d 100644
--- a/src/doc/src/qtee-customization.qdoc
+++ b/src/doc/src/qtee-customization.qdoc
@@ -37,7 +37,7 @@
     resides) is mounted read-only at boot time. To allow modification,
     remount it read-write by entering the following command:
     \badcode
-        <INSTALL_DIR>/Tools/b2qt/adb remount
+        adb remount
     \endcode
 
     In the \c{appcontroller.conf} file, the input devices are
@@ -102,7 +102,7 @@
 
     Alternatively, you can also use the following command:
     \badcode
-    <INSTALL_DIR>/Tools/b2qt/adb shell appcontroller --make-default <path>
+    adb shell appcontroller --make-default <path>
     \endcode
 
     Where \c{<path>} is the install path of your application binary on the
@@ -111,7 +111,7 @@
     To remove your application from the default startup, use the following
     command:
     \badcode
-        <INSTALL_DIR>/Tools/b2qt/adb shell appcontroller --remove-default
+    adb shell appcontroller --remove-default
     \endcode
 
     \section1 Configuring Display Resolution
@@ -246,7 +246,7 @@
     connected via USB.
 
     \badcode
-     <INSTALL_DIR>/Tools/b2qt/adb shell "sed -i -e 's/USE_ETHERNET=no/USE_ETHERNET=yes/' /etc/default/adbd; sync"
+     adb shell "sed -i -e 's/USE_ETHERNET=no/USE_ETHERNET=yes/' /etc/default/adbd; sync"
     \endcode
 
     \note You need to restart the device for this change to take effect.
diff --git a/src/doc/src/qtee-index.qdoc b/src/doc/src/qtee-index.qdoc
index edec7bb..02403f1 100644
--- a/src/doc/src/qtee-index.qdoc
+++ b/src/doc/src/qtee-index.qdoc
@@ -130,7 +130,7 @@
 
     The development environment is built around the Qt Creator IDE. Qt Creator
     runs on all desktop platforms, but the embedded development environment is
-    currently supported only on 64-bit Linux desktop.
+    currently supported only on 64-bit Linux desktop and Windows.
 
     Device deployment can be done directly from the Qt Creator IDE to a device
     connected via USB or local area network. The Qt Creator IDE is
@@ -170,7 +170,7 @@
     \image build-your-own-stack.png
 
     \B2QL is using the traditional embedded Linux
-    kernel built with the Yocto Poky reference system (Yocto 1.6 Daisy release).
+    kernel built with the Yocto Poky reference system (Yocto 1.8 Fido release).
     The embedded Linux variant is designed for great customization possibilities.
     It contains only components required in the embedded device, resulting in
     smaller image sizes while keeping valuable development tools available.
diff --git a/src/doc/src/qtee-install-guide.qdoc b/src/doc/src/qtee-install-guide.qdoc
index 2c0669d..ed9a742 100644
--- a/src/doc/src/qtee-install-guide.qdoc
+++ b/src/doc/src/qtee-install-guide.qdoc
@@ -31,13 +31,16 @@
     \target Requirements for Development Host
     \section1 Requirements for Development Host
 
-    A 64-bit Linux system is required to install and use \SDK. Instructions
-    in this documentation assume Ubuntu Linux 64-bit 12.04 LTS or later.
-    Other Linux distributions may work, but have not been tested. C/C++ build
-    essentials must be installed.
+    Either 64-bit Linux or a Windows system is required to install and use \SDK.
+    Instructions in this documentation assume Windows 7 or later or Ubuntu Linux 64-bit 12.04 LTS
+    or later. Other Linux distributions may work, but have not been tested. C/C++ build
+    essentials must be installed on the Linux host.
 
-    \target Installing 32-bit Support Libraries
-    \section1 1. Installing 32-bit Support Libraries
+    \target Host Specific Requirements
+    \section1 1. Host Specific Requirements
+
+    \target Linux: Installing 32-bit Support Libraries
+    \section2 1.1 Linux: Installing 32-bit Support Libraries
 
     Some of the build tools in \SDK are 32-bit programs, and on 64-bit
     systems they require support libraries for running 32-bit code. To
@@ -54,13 +57,24 @@
         sudo apt-get install g++-multilib ia32-libs
     \endcode
 
+    \target Windows: Installing ADB
+    \section2 1.2 Windows: Installing ADB
+
+    Qt Creator needs \e adb to communicate and deploy data to the target device.
+    You can install adb as a part of the Android SDK Tools Package, which can be downloaded
+    from \l{http://developer.android.com/sdk/index.html#Other}.
+    Make sure to select \b {Tools} > \b {Android SDK Platform-tools} and \b {Extras} > \b {Google USB Driver}
+    in the Android SDK manager (anything else is not needed and can be disabled).
+
     \target Installing VirtualBox
     \section1 2. Installing VirtualBox
 
     The \B2Q emulator in \SDK relies on VirtualBox virtualization software. You can
-    download it from \l{https://www.virtualbox.org/wiki/Linux_Downloads} or
+    download it from \l{https://www.virtualbox.org/wiki/Downloads} or
     install it via distribution tools.
 
+    On Windows you just have to follow the installation wizard of the downloaded package.
+
     If you are running an older Ubuntu system such as 12.04, the version of
     VirtualBox provided by the distribution is not recent enough. To install a
     newer version, first add a foreign package source:
@@ -82,7 +96,9 @@
         \li Start the VirtualBox user interface.
         \li Select \b{File > Preferences} > \b{Network} to open VirtualBox
             network settings.
-        \li Create a new host-only network named \e{vboxnet0} and edit its properties:
+        \li Create a new host-only network named \e{vboxnet0} on Linux and
+            \e{VirtualBox Host-Only Ethernet Adapter} on Windows. This should be the default naming
+            on those host platforms. Edit its properties:
 
         \list 1
             \li Change the IPv4 address to \c{192.168.56.1} and the IPv4 network
@@ -103,7 +119,9 @@
 
     \list 1
 
-        \li Download the binary \SDK installer, and make sure it is executable
+        \li Download the binary \SDK installer.
+
+        \li On Linux make sure it is executable
             by using one of the following methods:
 
     \list
@@ -121,7 +139,7 @@
     The installer will let you select a directory where \SDK will be
     installed. In this documentation, the installation directory is referred
     to as \b{\c{<INSTALL_DIR>}}. The default installation directory is
-    \tt{~/Qt}.
+    \tt{~/Qt} on Linux and \tt{C:\\Qt} on Windows.
 
     \target Installing Boot to Qt on Target Devices
     \section1 4. Install \B2Q on Target Devices
diff --git a/src/doc/src/qtee-licenses.qdoc b/src/doc/src/qtee-licenses.qdoc
index bd23fd5..9119765 100644
--- a/src/doc/src/qtee-licenses.qdoc
+++ b/src/doc/src/qtee-licenses.qdoc
@@ -31,8 +31,45 @@
 
     \section1 3rd Party Software Licenses
 
-    The third-party licenses used in \SDK are listed in the file
-    \c {<INSTALL_DIR>/Licenses/ThirdPartySoftware_Listing.txt}.
+    The following third-party components are used in \SDK:
+
+    \table
+    \row \li Component \li Description \li License Type
+    \row \li EGL 1.5 Headers
+         \li These headers are based on EGL 1.5 specification.
+         \li MIT License
+
+    \row \li OpenGL ES 2.0 Headers
+         \li These headers are based on Open GL ES 2.0 specification.
+         \li MIT and SGI License
+
+    \row \li OpenGL ES 3.1 Headers
+         \li These headers are based on OpenGL ES 3.1 specification.
+         \li MIT and SGI License
+
+    \row \li OpenKODE Core 1.0 Header
+         \li The header is based on OpenKODE Core 1.0 specification.
+         \li MIT License
+
+    \row \li Lipi Toolkit (LipiTk)
+         \li An open source toolkit for online Handwriting  Recognition (HWR).
+         \li MIT-Style License
+
+    \row \li OpenWnn
+         \li A Japanese IME
+         \li Apache License
+
+    \row \li Pinyin
+         \li An IME for Standard Chinese input.
+         \li Apache License
+
+    \row \li Traditional Chinese IME (tcime)
+         \li A traditional Chinese IME.
+         \li Apache License
+    \endtable
+
+    See the \l{Licenses Used by Qt}{licenses} page for the complete list
+    of third-Party components used by Qt.
 
     \section1 Embedded Linux Images
 
diff --git a/src/doc/src/qtee-troubleshooting.qdoc b/src/doc/src/qtee-troubleshooting.qdoc
index dc8a5fc..ffa54dd 100644
--- a/src/doc/src/qtee-troubleshooting.qdoc
+++ b/src/doc/src/qtee-troubleshooting.qdoc
@@ -146,6 +146,27 @@
 
     See \l{5. Setting up USB Access to Embedded Devices}.
 
+    Additionally on Windows, you may need to install or update the Android Device driver.
+    You can check whether a driver is already installed when a device is attached
+    via the \b {Device Manager}. If you haven't installed any driver there should
+    be an \b {USB Function Filesystem} under \b {Other devices}. If this is the case
+    you have to install the USB driver by the following steps:
+
+    \list 1
+        \li Open \b {Other devices} > \b {USB Function Filesystem}).
+        \li Switch to the Driver tab and click \b {Update Driver}.
+        \li Do not let windows search automatically for an updated driver, but
+            select "Browse My Computer for driver software".
+        \li Select "Let me pick from a list of device drivers on my computer".
+        \li Open "Have Disk..."
+        \li Install the driver that is located at
+            <Android-SDK-Tools-install-dir>\\extras\\google\\usb_driver\\android_winusb.inf
+    \endlist
+
+    If you already have an \b {Android ADB Interface} under \b {Android Device} you may need
+    to update the driver. This can be achieved by running the previous steps on the
+    \b {Android Device} > \b {Android ADB Interface}.
+
     \target ts-15
     \b{adb fails with "error: more than one device and emulator"}
 
diff --git a/src/doc/src/shared/b2qt-external-pages.qdoc b/src/doc/src/shared/b2qt-external-pages.qdoc
index 106de1c..08628c6 100644
--- a/src/doc/src/shared/b2qt-external-pages.qdoc
+++ b/src/doc/src/shared/b2qt-external-pages.qdoc
@@ -21,6 +21,10 @@
     \externalpage http://doc.qt.io/
     \title Qt reference documentation
 */
+/*!
+    \externalpage http://doc.qt.io/qt-5/licensing.html#licenses-used-in-qt
+    \title Licenses Used by Qt
+*/
 
 /*!
     \externalpage http://doc.qt.io/qt-5/android-support.html
diff --git a/src/doc/src/shared/b2qt-post-install-setup.qdocinc b/src/doc/src/shared/b2qt-post-install-setup.qdocinc
index 4444dfc..900b336 100644
--- a/src/doc/src/shared/b2qt-post-install-setup.qdocinc
+++ b/src/doc/src/shared/b2qt-post-install-setup.qdocinc
@@ -33,14 +33,23 @@
         \li Connect the running device to the development host with a USB
     cable. If the device is already connected, disconnect and reconnect the USB
     cable after running the command above.
+    \endlist
+
+    The system log files \c{/var/log/udev} and \c{/var/log/syslog} may
+    provide relevant information in case of connection problems.
 
-        \li You can confirm that the connection is working by running
-    the following shell command:
+    You can confirm that the connection is working by running the following command on Linux:
 
     \code
         <INSTALL_DIR>/Tools/b2qt/adb devices -l
     \endcode
 
+    Or the following command on Windows:
+
+    \code
+        <Android-SDK-Tools-install-dir>\platform-tools\adb.exe devices -l
+    \endcode
+
     The output should be a list of connected \B2Q (and Android) devices,
     identified with a serial number and a name. If your device is missing from
     the list, or the serial number is \c{??????}, the connection is
@@ -49,10 +58,7 @@
 
     The emulator may be listed as well. Its serial number is its IP and the port
     number: \c{192.168.56.101:5555}.
-    \endlist
 
-    The system log files \c{/var/log/udev} and \c{/var/log/syslog} may
-    provide relevant information in case of connection problems.
 //! [setting up usb access]
 
 //! [configuring device kit]
diff --git a/src/doc/src/shared/common.qdocinc b/src/doc/src/shared/common.qdocinc
index 3a449c8..6d6d18e 100644
--- a/src/doc/src/shared/common.qdocinc
+++ b/src/doc/src/shared/common.qdocinc
@@ -36,7 +36,7 @@
     device for \B2Q. In Qt Creator, select \b Tools > \b {Flash \B2Q Device}
     and follow the step-by-step instructions.
 
-    Alternatively, you can install the image from the command line using
+    On Linux, you can alternatively install the image from the command line using
     the instructions below.
 
     \b {Install from the Command Line}
diff --git a/src/doc/src/shared/detect-sd-card-device-name.qdocinc b/src/doc/src/shared/detect-sd-card-device-name.qdocinc
index dbc1a64..d934c60 100644
--- a/src/doc/src/shared/detect-sd-card-device-name.qdocinc
+++ b/src/doc/src/shared/detect-sd-card-device-name.qdocinc
@@ -19,7 +19,7 @@
 /*!
 //! [instructions]
     Plug in the SD card or reader to the development host,
-    and use the following command to find out its device name:
+    and use the following command on Linux to find out its device name:
 
     \badcode
         lsblk -d
@@ -28,12 +28,18 @@
     Removable devices such as SD cards have the value '1' in
     the \e RM column.
 
-    \warning Make sure to select the correct device, because selecting
-    the wrong one can result in a wiped hard drive.
-
     Typical device names for SD cards include \c {sdb} and
     \c {mmcblk0}. The full device path is \c {/dev/} followed by
     the name.
+
+    On Windows, use the following command to get the SD cards device name:
+    \badcode
+        wmic logicaldisk where "drivetype=2 and access=0" get deviceid, volumename
+    \endcode
+
+    \warning Make sure to select the correct device, because selecting
+    the wrong one can result in a wiped hard drive.
+
 //! [instructions]
 
 //! [unmount]