Doc: Removed references to embedded Android

The commit also includes minor language edits.

Change-Id: I641452dae29cafdbfe8846d5fc1a7d8302d257d8
Task-number: QTEE-922
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>

3 files changed, 17 insertions, 224 deletions

diff --git a/src/doc/src/devices/qtee-bd-sl-imx6.qdoc b/src/doc/src/devices/qtee-bd-sl-imx6.qdoc
index e94835b..68f32cd 100644
--- a/src/doc/src/devices/qtee-bd-sl-imx6.qdoc
+++ b/src/doc/src/devices/qtee-bd-sl-imx6.qdoc
@@ -26,15 +26,14 @@
     \list
         \li \l{http://boundarydevices.com/products/sabre-lite-imx6-sbc/}
             {Boundary Devices BD-SL-i.MX6 (SABRE Lite)}
-            (embedded Android and Linux)
         \li \l{http://boundarydevices.com/product/nitrogen6x-copy/}
-            {Boundary Devices Nitrogen6X} (embedded Linux only)
+            {Boundary Devices Nitrogen6X}
         \li \l{http://boundarydevices.com/product/nitrogen6_lite/}
-            {Boundary Devices Nitrogen6_Lite} (embedded Linux only)
+            {Boundary Devices Nitrogen6_Lite}
         \li \l{http://boundarydevices.com/product/nitrogen6max/}
-            {Boundary Devices Nitrogen6_MAX} (embedded Linux only)
+            {Boundary Devices Nitrogen6_MAX}
         \li \l{http://boundarydevices.com/product/nitrogen6x-som/}
-            {Boundary Devices Nitrogen6X_SOM} (embedded Linux only)
+            {Boundary Devices Nitrogen6X_SOM}
     \endlist
 
     \note It is important that you repeat the steps in this section after you
@@ -45,37 +44,10 @@
 
     \section1 Preparing an SD Card
 
-    For \B2QA, an SD card of at least 4 GB capacity is needed. For \B2QL,
-    a card of at least 1 GB capacity is sufficient.
+    For \B2QL, an SD card of at least 1 GB capacity is needed.
 
     \include detect-sd-card-device-name.qdocinc instructions
 
-    \section1 Installing the Android Image
-
-    \e{If installing} \B2QL, \e{you can skip this step and proceed to}
-    \l{#Installing the Boot to Qt Image}{Installing the Boot to Qt Image}.
-
-    Download the package \e{imx6-jb-20130628.tar.gz} from
-    \l{http://boundarydevices.com/android-jellybean-on-i-mx6-with-no-disclaimers/}{Boundary
-    Devices Android Jellybean i.MX6 images} (registration required).
-
-    Use the following commands to create an SD card containing the
-    downloaded image:
-
-    \list 1
-        \li Extract the downloaded package:
-        \badcode
-        ~/$ mkdir bd-android
-        ~/$ cd bd-android
-        ~/bd-android$ tar zxvf ~/Downloads/imx6-jb-20130628.tar.gz
-        \endcode
-        \li Run device/boundary/mksdcard.sh:
-        \badcode
-        ~/bd-android$ sudo device/boundary/mksdcard.sh /dev/<device_name>
-        ~/bd-android$ sync
-        \endcode
-    \endlist
-
     \section1 Installing the \B2Q Image
 
     \include common.qdocinc wizard
@@ -91,21 +63,12 @@
 
     \include detect-sd-card-device-name.qdocinc unmount
 
-    Then, use one of the commands below, depending on whether you are developing
-    for embedded Android or Linux:
+    Then, use the following command to install the embedded Linux image:
 
-    \list
-        \li \b{\B2QA}
-        \badcode
-            cd <INSTALL_DIR>
-            ./Boot2Qt-4.x/generic-4.2-eAndroid/images/iMX6/deploy.sh /dev/<device_name>
-        \endcode
-        \li \b{\B2QL}
-        \badcode
-            cd <INSTALL_DIR>
-            sudo ./Boot2Qt-4.x/iMX6-eLinux/images/deploy.sh /dev/<device_name>
-        \endcode
-    \endlist
+    \badcode
+        cd <INSTALL_DIR>
+        sudo ./Boot2Qt-4.x/iMX6-eLinux/images/deploy.sh /dev/<device_name>
+    \endcode
 
     After the installation is complete, insert the SD card, power on the device and check that
     the \B2Q welcome screen and/or demo appear.
@@ -116,7 +79,7 @@
 
     \section1 Configuring a Device Kit in Qt Creator
 
-    \include b2qt-post-install-setup.qdocinc configuring device kit android linux
+    \include b2qt-post-install-setup.qdocinc configuring device kit linux
 
     You are now ready to start developing for your device. For more information,
     see \l{Building and Running an Example}.
diff --git a/src/doc/src/devices/qtee-nexus-7.qdoc b/src/doc/src/devices/qtee-nexus-7.qdoc
deleted file mode 100644
index 54ba445..0000000
--- a/src/doc/src/devices/qtee-nexus-7.qdoc
+++ /dev/null
@@ -1,105 +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
-**
-****************************************************************************/
-/*!
-    \target Nexus 7 (2012/2013) (embedded Android)
-    \page qtee-preparing-hardware-nexus-7.html
-    \title Preparing Nexus 7 (2012/2013)
-    \previouspage qtee-installation-guide.html
-    \nextpage qtee-building-and-running.html
-
-    Take the following steps to prepare a
-    \l{http://www.google.com/nexus/7/specs/}{Nexus 7 (2012/2013)} for
-    \B2Q.
-
-    \note The installation process will wipe the device. Make sure to
-    backup any personal data. The device can later be restored to
-    factory state, see \l{nexus-factory-reset}{Troubleshooting}.
-
-    The Nexus 7 must have the same Android main version (e.g. \c{4.2}
-    or \c{4.4}) as the generic \B2Q eAndroid stack that is to be
-    installed. If needed, you can update the Android version either by
-    using Android's upgrading tool, or by flashing a factory image of
-    the right version. See \l{nexus-factory-reset}{Troubleshooting}.
-
-    \section1 Enabling Developer Mode
-
-    In order to install the \B2Q stack into the Nexus 7, you need to
-    enable developer mode and USB debugging. This is only needed for
-    the first time install.
-
-    \note If for some reason the device does not boot up normally, it
-    is also possible to install to a Nexus 7 started up in
-    \c{fastboot} (bootloader) mode (see
-    \l{nexus-factory-reset}{Troubleshooting}). Just skip this section
-    and add the \c{-fastboot} argument to the \c{deploy.sh} command
-    below.
-
-    \list 1
-        \li Power up the device.
-        \li Open the \b{Settings} app and select the \b{About tablet} item.
-        \li Press the \b{Build number} item seven times, until the message "You are now a developer!" appears.
-
-        \li Back in the \b{Settings} menu, select \b{Developer options}.
-        \li Press the \b{USB debugging} item and confirm that you allow USB debugging.
-    \endlist
-
-    You should now be able to establish USB connection to the device as follows.
-
-    \section1 Setting up USB Access
-
-    \include b2qt-post-install-setup.qdocinc setting up usb access
-
-    \section1 Deploying the \B2Q Stack
-
-    \include common.qdocinc wizard
-
-    Depending on the edition of your Nexus 7 device, use one of the
-    commands below to install the \B2Q stack. Replace \c{X.Y} with the
-    device's Android version number, for example \c{4.2} or \c{4.4}.
-
-    \note The deploy script will check that the connected Nexus device
-    is of the expected type and Android version, and abort the
-    installation if it is not.
-
-    \list
-        \li \b{Nexus 7 (2013):}
-        \badcode
-            cd <INSTALL_DIR>
-            ./Boot2Qt-4.x/generic-X.Y-eAndroid/images/nexus7v2/deploy.sh
-        \endcode
-        \li \b{Nexus 7 (2012):}
-        \badcode
-            cd <INSTALL_DIR>
-            ./Boot2Qt-4.x/generic-X.Y-eAndroid/images/nexus7/deploy.sh
-        \endcode
-    \endlist
-
-    During the installation, the device may ask for confirmation to be
-    unlocked. Press the power button once to confirm.
-
-    The device will reboot during the process. Do not interact with it
-    or unplug it until the process is fully completed.
-
-    \section1 Configuring a Device Kit in Qt Creator
-
-    \include b2qt-post-install-setup.qdocinc configuring device kit android
-
-    You are now ready to start developing for your device. For more information,
-    see \l{Building and Running an Example}.
-*/
diff --git a/src/doc/src/devices/qtee-supported-devices.qdoc b/src/doc/src/devices/qtee-supported-devices.qdoc
index a41a8bd..1b4cd4f 100644
--- a/src/doc/src/devices/qtee-supported-devices.qdoc
+++ b/src/doc/src/devices/qtee-supported-devices.qdoc
@@ -28,7 +28,6 @@
     \B2Q stack. These steps vary from device to device:
 
     \list
-        \li \l{Nexus 7 (2012/2013) (embedded Android)}
         \li \l{Boundary Devices i.MX6 Boards}
         \li \l{SABRE SD i.MX6Quad (embedded Linux)}
         \li \l{SABRE SD i.MX6Dual (embedded Linux)}
@@ -64,11 +63,6 @@
         \li OpenGL ES 2.0 support
     \endlist
 
-    \B2QA requires hardware that has support for the Android operating
-    system, version 4.2 or later. For rapid prototyping or feasibility testing,
-    it is possible to install it on most programmable Android devices using
-    \l {Android injection}.
-
     \section1 Supported Device Groups
 
     The reference devices are divided into three groups, based on level
@@ -82,43 +76,32 @@
     need to be reproducible with Qt libraries for further investigation by
     the support team.
 
-    Pre-compiled images for group 1 devices are available via the Qt
-    online installer.
+    Pre-compiled embedded Linux images for group 1 devices are available via
+    the Qt online installer.
 
     \table
-    \header \li Device \li eLinux \li eAndroid
+    \header \li Devices with GPU \li eLinux
     \row \li \l{http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=RDIMX6SABREBRD}
              {Freescale® SABRE SD i.MX6} (Freescale® i.MX6)\br
              ARM Cortex A9, Vivante GC2000 GPU, 1GB RAM
          \li \image ok
-         \li
     \row \li \l{http://beagleboard.org/products/beaglebone%20black}
             {BeagleBone Black}\br
             TIAM335x 1GHz ARM® Cortex-A8, 512 MB RAM
          \li \image ok
-         \li
-    \row \li \l{http://www.google.com/nexus/7/specs/}
-            {Google Nexus 7 (2013)}\br
-            Qualcomm Snapdragon S4 Pro APQ8064–1AA SoC (1.5 GHz\br
-            quad-core Krait 300 and an Adreno 320 GPU, clocked at 400 MHz)
-         \li
-         \li \image ok
     \row \li \b{\B2Q Emulator}\br
          Included in the development environment
          \li \image ok
-         \li \image ok
-    \header \li Devices Without GPU \li \li
+    \header \li Devices Without GPU \li
     \row \li \l{https://www.toradex.com/products/colibri-arm-computer-modules/freescale-vybrid-VF6xx-computer-module}
              {Toradex Colibri VF61}\br
              Dual-core (ARM Cortex-A5 + ARM Cortex-M4)\br
              solution with 1 MB on-chip SRAM
          \li \image ok
-         \li
     \row \li \l{https://www.toradex.com/products/colibri-arm-computer-modules/freescale-vybrid-VF5xx-computer-module}
             {Toradex Colibri VF50}\br
             Single-core (ARM Cortex-A5) solution with 1.5 MB on-chip SRAM
          \li \image ok
-         \li
     \endtable
 
     \section2 Group 2
@@ -137,37 +120,27 @@
     online installer.
 
     \table
-    \header \li Device \li eLinux \li eAndroid
-    \row \li \l{http://www.google.com/nexus/7/specs/}
-            {Google Nexus 7 (2012)}\br
-            Nvidia Tegra 3 SoC (1.3 GHz Quad-Core ARM\br
-            Cortex A9, Nvidia GeForce ULP GPU, 1GB RAM)
-         \li
-         \li \image ok
+    \header \li Devices with GPU \li eLinux
     \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
          \li \image ok
-         \li
     \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
             2GB DDR3, 128MB NOR, Vivante GC2000 GPU
          \li \image ok
-         \li
     \row \li \l{http://www.toradex.com/products/apalis-arm-computer-modules/freescale-imx-6-computer-module}
             {Toradex Apalis iMX6}\br
             Freescale® i.MX 6Q ARM Cortex™-A9 @1 GHz,\br
             1GB DDR3, 4GB eMMC, Vivante GC2000 GPU
          \li \image ok
-         \li
     \row \li \l{http://www.raspberrypi.org/faqs}
             {Raspberry Pi Model B}\br
             700 Mhz ARM11, Broadcom videocode IV\br
             @250MHz GPU, 512 MB (shared with GPU) RAM
          \li \image ok
-         \li
     \endtable
 
     \section2 Group 3
@@ -180,13 +153,12 @@
     The Qt Company for consultancy services.
 
     \table
-    \header \li Device \li eLinux \li eAndroid \li Notes
+    \header \li Device \li eLinux \li Notes
     \row \li \l{http://beagleboard.org/hardware-xM}
              {BeagleBoard-xM}\br
              1GHz ARM Cortex A8, PowerVR SGX530 GPU,\br
              512MB RAM
          \li \image ok
-         \li \image ok
          \li
     \row \li \l{http://processors.wiki.ti.com/index.php/AM335x_Starter_Kit}
              {Sitara AM335x Starter Kit}\br
@@ -194,28 +166,13 @@
              with 4.3-inch LCD touchscreen
          \li \image ok
          \li
-         \li
     \row \li \l{http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=IMX53QSB}
              {Freescale® iMX53 Quick Start Board}\br
              1GHz ARM Cortex™-A8
          \li \image ok
          \li
-         \li
-    \row \li \l{http://beagleboard.org/products/beaglebone%20black}
-            {BeagleBone Black} (eAndroid)\br
-            TIAM335x 1GHz ARM® Cortex-A8, 512 MB RAM
-         \li
-         \li \image ok
-         \li eLinux: See \l{Group 1}
     \endtable
 
-    \b Notes:
-
-    Starting from \B2Q 4.0 release, the embedded Android platform
-    is no longer tested and supported on the BeagleBone Black. It is,
-    however, still tested and supported in the earlier 3.x releases.
-    Also, it possible to install \B2QA on it using \l {Android injection}.
-
     \section2 Supported Features on Reference Devices
 
     The following features are supported without any modification on the
@@ -257,17 +214,6 @@
             \li \image ok
             \li \image ok
             \li
-    \row    \li Google Nexus 7 (2013)
-            \li \image ok
-            \li \image ok
-            \li \image ok
-            \li \image ok
-            \li \image ok
-            \li \image ok
-            \li \image ok
-            \li \image ok
-            \li \image ok
-            \li
     \row    \li Toradex Colibri VF61
             \li \image ok
             \li \image ok
@@ -291,17 +237,6 @@
             \li
             \li \image ok
     \header \li Group 2 \li \li \li \li \li \li \li \li \li \li
-    \row    \li Google Nexus 7 (2012)
-            \li \image ok
-            \li \image ok
-            \li \image ok
-            \li \image ok
-            \li
-            \li \image ok
-            \li \image ok
-            \li \image ok
-            \li \image ok
-            \li
     \row    \li Boundary Devices i.MX6 Boards
             \li \image ok
             \li \image ok