Merge remote-tracking branch 'origin/release' into stable

Change-Id: Iaec8f6512f8e63ec3e9176a8025f8ffc42bea462

1 files changed, 13 insertions, 0 deletions

diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc
index 46782907f..5f117ec50 100644
--- a/doc/src/platforms/android.qdoc
+++ b/doc/src/platforms/android.qdoc
@@ -50,6 +50,15 @@ In order to use Qt for Android, you will need the following external tools:
 \li \l{http://developer.android.com/tools/sdk/ndk/index.html}{The Android NDK}
 \li \l{http://ant.apache.org/bindownload.cgi}{Apache Ant} v1.8 or later
 \li \l{http://openjdk.java.net}{OpenJDK} v6 or later
+\li Android Debug Bridge (ADB) driver on the Windows platform to enable USB
+    debugging. The default USB driver on Windows does not allow debugging. You
+    can download the ADB driver from the device manufacturer's support website.
+    For example, the ADB driver for Google Nexus 7 can be downloaded from
+    \l{http://support.asus.com}.
+
+    After installing the driver, try running a few basic
+    \l{http://developer.android.com/tools/help/adb.html}{adb} commands and check
+    whether your device responds to it.
 \endlist
 
 \note You must set the \c{JAVA_HOME} environment variable to the JDK install
@@ -78,6 +87,10 @@ to develop for Android. For more information, see
 \gui{Select Components} page of \l{Qt Installation Program}
 {Qt installation program}. By default, Qt libraries for ARMv7 are selected.
 
+Test your setup by running one of the desktop examples. You can list all the
+examples tested for Android using the \c{android} keyword in the search field
+under the \gui{Examples} tab in Qt Creator \gui{Welcome} mode.
+
 \section1 Porting an Existing Qt Application
 
 Most Qt applications should be portable to Android with ease, unless they