Doc: Reworded a \note and removed references to ARMv5

The note was added earlier to inform the developers
that they must explicitly select one of the Qt libraries
for Android. Now that the latest installer package selects
the ARMv7 version by default, I reworded the \note.

Also, removed references to the ARMv5 builds.

Task-number: QTBUG-30173
Change-Id: I8fa764333a20faff4f3f4b8350c57b233cbd8d54
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

3 files changed, 8 insertions, 7 deletions

diff --git a/doc/src/getting-started/installer-README.qdoc b/doc/src/getting-started/installer-README.qdoc
index 36f403d1..46b03e8c 100644
--- a/doc/src/getting-started/installer-README.qdoc
+++ b/doc/src/getting-started/installer-README.qdoc
@@ -97,13 +97,13 @@ summarizes the available installers.
         \li MSVC 2012 SP2
     \row
         \li Android Linux 32-bit host installer
-        \li x86, ARMv5, ARMv7 Android targets
+        \li x86 and ARMv7
     \row
         \li Android Linux 64-bit host installer
-        \li x86, ARMv5, ARMv7 Android targets
+        \li x86 and ARMv7
     \row
         \li Android Windows 32-bit host installer
-        \li x86, armv5, armv7 Android targets
+        \li x86 and ARMv7
     \endtable
 
 \section1 Starting Development Tools
diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc
index 27fe5e18..5f1a3ac1 100644
--- a/doc/src/platforms/android.qdoc
+++ b/doc/src/platforms/android.qdoc
@@ -69,9 +69,10 @@ After the SDK is updated, install the Qt 5.1 binaries using the
 to develop for Android. For more information, see
 \l{Qt Creator: Connecting Android Devices}.
 
-\note You must manually choose at least one of the two Qt libraries for Android
-(x86 and ARMv7) from the \gui{Qt 5.1.0} component tree within the \gui{Select
-Components} page of \l{Qt Installation Program}{Qt installation program}.
+\note You must select at least one of the two Qt libraries for Android
+(x86 and ARMv7) from the \gui{Qt 5.1.0} component tree in the
+\gui{Select Components} page of \l{Qt Installation Program}
+{Qt installation program}. By default, Qt libraries for ARMv7 are selected.
 
 \section1 Porting an Existing Qt Application
 
diff --git a/doc/src/platforms/platform-notes-android.qdoc b/doc/src/platforms/platform-notes-android.qdoc
index 9605b6e4..287c6f0b 100644
--- a/doc/src/platforms/platform-notes-android.qdoc
+++ b/doc/src/platforms/platform-notes-android.qdoc
@@ -146,7 +146,7 @@
 
     \section1 Supported Architectures
 
-    Qt for Android currently has binaries for ARMv5, ARMv7, and x86. Make sure you select the
+    Qt for Android currently has binaries for ARMv7 and x86. Make sure you select the
     correct architecture for the device or emulator you are targeting, otherwise your application
     will crash. The MIPS archictecture is currently not supported by Qt.