Merge commit '64164764fdfe9ed736b7367d573c0daa026b777f' into releaseQtEE_v3.1.0

* commit '64164764fdfe9ed736b7367d573c0daa026b777f':
  Doc: ChangeLog for 3.1.0 release
  Doc: Android-specific instructions for Qt Creator Kit setup
  Doc: Add note about crash message when closing an application
  Fix #ifdef for Android detection
  Doc: Bump version to 3.1.0
  Doc: Update the Supported Platforms page
  Doc: Fix path for sabre install
  doc: add documentation for Toradex Apalis iMX6
  Doc: injection to eAndroid reference devices
  Fix Wifi issues on Android 4.4.2
  Don't hardcode interface name in getIPAddress()
  Doc: Update the list of supported platforms
  Add plugins.qmltypes for Wi-Fi library

Change-Id: I73af0af038f8bf9e5f10387b558c428f7a23461c

1 files changed, 36 insertions, 0 deletions

diff --git a/src/doc/src/b2qt-post-install-setup.qdocinc b/src/doc/src/b2qt-post-install-setup.qdocinc
index ec293de..0bd96dd 100644
--- a/src/doc/src/b2qt-post-install-setup.qdocinc
+++ b/src/doc/src/b2qt-post-install-setup.qdocinc
@@ -56,12 +56,14 @@
 //! [setting up usb access]
 
 //! [configuring device kit]
+//! [common config device kit]
     After you have prepared the hardware, you must perform one final step
     to set up the development tools in Qt Creator for your device. That is,
     you must configure the correct device to be used for each build and run
     \e{kit}. Connect your device to the development host via USB and launch
     Qt Creator. In Qt Creator:
 
+//! [common config device kit]
 //! [steps for device kit]
     \list 1
         \li Select \b{Tools > Options > Build & Run > Kits}.
@@ -73,6 +75,25 @@
 //! [steps for device kit]
 //! [configuring device kit]
 
+//! [android steps for dev kit]
+    \list 1
+        \li Select \b{Tools > Options > Build & Run > Kits}.
+        \li Select the kit with the correct Android version
+            (for example, \e {generic-4.2}).
+        \li Select the correct device in the \b{Device} field.
+        \li Select \b{OK}.
+    \endlist
+
+    If you have more than one development device that use the same Android
+    version, clone the \e generic kit and rename it after the physical device:
+
+    \list 1
+        \li Select the generic Android kit and then \b Clone.
+        \li Select the correct device in the \b{Device} field.
+        \li Edit the name of the cloned kit and press \b OK.
+    \endlist
+//! [android steps for dev kit]
+
 //! [configuring network device]
     After you have prepared the hardware, you must set up the development tools
     in Qt Creator for your device. Connect your device to the network via an
@@ -93,4 +114,19 @@
     \include b2qt-post-install-setup.qdocinc steps for device kit
 
 //! [configuring network device]
+
+//! [configuring device kit android]
+    \include b2qt-post-install-setup.qdocinc common config device kit
+    \include b2qt-post-install-setup.qdocinc android steps for dev kit
+//! [configuring device kit android]
+
+//! [configuring device kit android linux]
+    \include b2qt-post-install-setup.qdocinc common config device kit
+    \list
+        \li \b{\B2QL}
+            \include b2qt-post-install-setup.qdocinc steps for device kit
+        \li \b{\B2QA}
+            \include b2qt-post-install-setup.qdocinc android steps for dev kit
+    \endlist
+//! [configuring device kit android linux]
 */