Doc: changes to Android plugin

Change-Id: Ib20faa1df93e1407635a247b93b6c667bff4b256
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

5 files changed, 36 insertions, 40 deletions

diff --git a/doc/images/qtcreator-deploy-android.png b/doc/images/qtcreator-deploy-android.png
index e886ff4b99..e468bbe7c4 100644..100755
--- a/doc/images/qtcreator-deploy-android.png
+++ b/doc/images/qtcreator-deploy-android.png
diff --git a/doc/images/qtcreator-options-android.png b/doc/images/qtcreator-options-android.png
index 247e102947..1fd988c089 100644..100755
--- a/doc/images/qtcreator-options-android.png
+++ b/doc/images/qtcreator-options-android.png
diff --git a/doc/src/android/androiddev.qdoc b/doc/src/android/androiddev.qdoc
index fe99efddb1..c0f03a15ed 100644
--- a/doc/src/android/androiddev.qdoc
+++ b/doc/src/android/androiddev.qdoc
@@ -32,7 +32,8 @@
     installed on the development PC, you can add it to \QC. You can then add a
     \l{glossary-buildandrun-kit}{kit}
     with the Android device type, the tool chain, and the Qt version for Android,
-    to build and run applications on Android devices.
+    to build and run applications on Android devices. You can also allow \QC to
+    automatically configure the kit.
 
     The Android Debug Bridge (adb) command line tool is integrated to \QC to
     enable you to deploy applications to connected Android devices, to run
@@ -65,8 +66,13 @@
 
             \c {ant -version}
 
-        \li \l{http://necessitas.kde.org/necessitas/necessitas_sdk_installer.php}
-            {Necessitas SDK}
+        \li A tool chain for building applications for Android devices. You have
+            several options, such as the
+            \l{http://developer.android.com/sdk/index.html}{Android SDK} and
+            \l{http://developer.android.com/tools/sdk/ndk/index.html}
+            {Android NDK} from Google or the
+            \l{http://necessitas.kde.org/necessitas/necessitas_sdk_installer.php}
+            {Necessitas SDK}.
 
     \endlist
 
@@ -80,31 +86,26 @@
     \list 1
 
         \li Select \gui Tools > \gui Options > \gui {Build & Run} >
-            \gui {Qt Versions} > \gui Add to add Qt for Android.
-
-        \li In the \gui {qmake location} field, add the \c qmake path from the
-            Qt for Android SDK
-            (\c {/opt/necessitas/Android/<qtversion>/bin/qmake} by default).
+            \gui {Qt Versions} > \gui Add to add the path to \c qmake path in
+            the Qt for Android SDK.
 
         \li Select \gui Tools > \gui Options > \gui Android to view and edit
             paths to the required software.
 
             \image qtcreator-options-android.png "Android options"
 
-        \li Select \gui Tools > \gui Options > \gui {Build & Run} >
-            \gui {Qt Versions} and build the GDB Helper to make the debugging
-            output for Qt specific constructs clean and easy to read.
-
-        \li To build the GDB Helper, select Qt for Android, select \gui Details
-            in the \gui Helpers section, and then select \gui Build in the
-            \gui {GDB Helper} field.
+        \li Select the \gui {Automatically create kits for Android tool chains}
+            check box to allow \QC to create the kits for you. \QC displays a
+            warning if it cannot find a suitable Qt version.
 
         \li Select \gui {Start Android AVD Manager} to create Android virtual
-            devices (AVD) that enable you emulate device hardware and software
+            devices (AVD) that enable you to emulate device hardware and software
             on the Android Emulator.
 
         \li To specify information for the Android manifest file, select
-            \gui Projects > \gui Run, and then select \gui Details to view the
+            \gui Projects > \gui Run for the \gui Android kit.
+
+        \li Select \gui Details to view the
             \gui {Package configurations}. For more information about the
             options you have, see
             \l{Specifying Run Settings for Android Devices}.
diff --git a/doc/src/android/deploying-android.qdoc b/doc/src/android/deploying-android.qdoc
index e071654293..0efc925033 100644
--- a/doc/src/android/deploying-android.qdoc
+++ b/doc/src/android/deploying-android.qdoc
@@ -30,29 +30,23 @@
 
     \image qtcreator-deploy-android.png "Deploy configurations"
 
-    Select the \gui {Use device's Qt libs} option to use Qt libraries installed
-    on the device. If you do not select the \gui {Use local Qt libs} option,
-    the application needs the Ministro package to run. However, if you select
-    the \gui {Use local Qt libs} option, \QC passes special parameters to the
-    application, forcing it to use Qt libraries from the \c{/data/local/qt}
-    folder on the device
-
-    Select the \gui {Deploy local Qt libs} option to deploy Qt libraries from
-    the specified Qt for Android SDK (for exmple, android-lighthouse-4.8.0).
-    This option enables you to develop on the Qt framework to test it.
-
-    The \gui {Deploy local Qt libs} option automatically selects the
-    \gui {Use local Qt libs} option. It is deselected automatically after \QC
-    pushes the Qt libs to the device. Select the option again to push your local
-    Qt modifications to devices. This option takes the same effect as the
-    \c{push_qt_libs.sh} script thas is located in the root folder of the
-    Qt for Android SDK. You can also use the \gui {Use local Qt libs}
-    independently of the \gui {Deploy local Qt libs} option.
+    Select the \gui {Use Qt libraries from device} option to use Qt libraries installed
+    on the device. If you also select the \gui {Use local Qt libraries} check box, \QC passes
+    special parameters to the application, forcing it to use Qt libraries from the
+    \c{/data/local/tmp/qt} folder on the device. If you do not select it, the application needs
+    the Ministro package to run.
+
+    Select the \gui {Deploy local Qt libraries} option to deploy Qt libraries from
+    the specified Qt for Android SDK (for example, android-lighthouse-4.8.0).
+    This option enables you to develop on the Qt framework to test it. This
+    option automatically selects the \gui {Use local Qt libraries} check box, but you
+    can use it also independently.
 
     \section1 Installing Ministro
 
-    To install Ministro, select the \gui {Install Ministro system} option. You
-    can also use it to install any Android package (.apk). You can use this
+    To install Ministro, select the \gui {Install Ministro, system-wide Qt shared
+    libraries installer} option. You
+    can use this option also to install any Android package (.apk). You can use this
     option to install applications on an Android Virtual Device (AVD). Download
     the Ministro .apk from the Google Market or from the
     \l{http://necessitas.kde.org/necessitas/ministro.php}{Ministro} home page.
diff --git a/doc/src/overview/creator-mobile-targets.qdoc b/doc/src/overview/creator-mobile-targets.qdoc
index 3eec3785a8..f2cce947a9 100644
--- a/doc/src/overview/creator-mobile-targets.qdoc
+++ b/doc/src/overview/creator-mobile-targets.qdoc
@@ -47,9 +47,10 @@
             Qt applications for Android are compiled as \c {shared objects} that
             are loaded by a Java launcher generated by the Qt for Android SDK.
             This is totally transparent to users. As Qt is composed of libraries
-            referencing each other, Qt applications are only supported on
-            Android version 1.6, or later. You must install the Qt for Android
-            SDK to develop for Android devices.
+            referencing each other, Qt 4 applications are only supported on
+            Android version 1.6, or later, and Qt 5 applications on version
+            2.3.3, or later. You must install the Qt for Android SDK to develop
+            for Android devices.
 
         \li \l{Connecting BlackBerry 10 Devices}