Merge remote-tracking branch 'origin/master' into wip/clangwip/clang

Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f

3 files changed, 6 insertions, 9 deletions

diff --git a/doc/src/android/androiddev.qdoc b/doc/src/android/androiddev.qdoc
index c72474d7ca..aa0987f0b4 100644
--- a/doc/src/android/androiddev.qdoc
+++ b/doc/src/android/androiddev.qdoc
@@ -127,7 +127,7 @@
         \li Select \gui Details to view the
             \gui {Package configurations}. For more information about the
             options you have, see
-            \l{Specifying Settings for Application Packages}.
+            \l{Specifying Settings for Qt 4 Packages}.
 
         \li To specify settings for deploying applications to Android, select
             \gui Details to view the \gui {Deploy configurations}. For more
@@ -142,8 +142,7 @@
     SDK to get the API and tools packages needed for development. In addition,
     you must install Qt for Android as part of Qt 5.2, or later.
 
-    For more information, see
-    \l{http://qt-project.org/doc/qt-5/android-support.html}{Qt for Android}.
+    For more information, see \l{Qt for Android}.
 
     To configure connections between \QC and Android devices:
 
@@ -219,7 +218,7 @@
     \gui Add. If you run an application without a device connected to the
     development PC and without an AVD specified, \QC asks you to add an AVD.
 
-    To manage AVDs, select \gui {Start Android AVD Manager}.
+    To manage AVDs, select \gui {Start AVD Manager}.
 
     \note The Android Emulator has a bug that prevents it from starting on some
     systems. If the Android Emulator does not start, you can try starting it
diff --git a/doc/src/android/creator-android-app-tutorial.qdoc b/doc/src/android/creator-android-app-tutorial.qdoc
index 7f8cf616dc..40ff224235 100644
--- a/doc/src/android/creator-android-app-tutorial.qdoc
+++ b/doc/src/android/creator-android-app-tutorial.qdoc
@@ -155,7 +155,7 @@
             import QtSensors 5.0
             \endcode
 
-        \li Add the Accelerometer type with the necessary properties:
+        \li Add the \l{Accelerometer} type with the necessary properties:
 
             \quotefromfile accelbubble/main.qml
             \skipto Accelerometer
diff --git a/doc/src/android/deploying-android.qdoc b/doc/src/android/deploying-android.qdoc
index 758687f86c..6d72012e0c 100644
--- a/doc/src/android/deploying-android.qdoc
+++ b/doc/src/android/deploying-android.qdoc
@@ -154,8 +154,7 @@
     For more information, see \l{Selecting Android Devices}.
 
     For more information about the \c androiddeployqt tool, see
-    \l{http://qt-project.org/doc/qt-5/deployment-android.html}
-    {Deploying an Application on Android}.
+    \l{Deploying an Application on Android}.
 
     \section2 Specifying Settings for Qt 5 Packages
 
@@ -168,8 +167,7 @@
     The anddroiddeployqt tool uses the information in the project .pro file to
     create APKs. For more information about the qmake variables
     that you can set in the .pro file to tailor the APK, see
-     \l{http://qt-project.org/doc/qt-5/deployment-android.html#qmake-variables}
-    {qmake Variables}.
+     \l{Deploying an Application on Android#qmake-variables}{qmake Variables}.
 
     You can view information about what the anddroiddeployqt tool is doing in
     the \gui {Compile Output} pane. To view additional information, select the