summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2016-10-04 16:58:17 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2016-10-06 06:51:10 +0000
commit02f5761c3d03aca64916fd22e9ede619659663b9 (patch)
treec475a6ce52356976d6ad64209cf7bb9c9d47bfd9 /doc
parent834ecc2a6b53f52c851657b9b6032a5d132b11fa (diff)
downloadqt-creator-02f5761c3d03aca64916fd22e9ede619659663b9.tar.gz
Doc: Update instructions for specifying settings for Android devices
Options have been moved to Tools > Options > Devices > Android. Change-Id: Iaaa9fd8e718609997b34a9b115e116e8a240bf38 Reviewed-by: Francois Ferrand <thetypz@gmail.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/images/qtcreator-options-android1.pngbin35757 -> 64075 bytes
-rw-r--r--doc/src/android/androiddev.qdoc7
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/images/qtcreator-options-android1.png b/doc/images/qtcreator-options-android1.png
index b4817e3209..1360b49cb6 100644
--- a/doc/images/qtcreator-options-android1.png
+++ b/doc/images/qtcreator-options-android1.png
Binary files differ
diff --git a/doc/src/android/androiddev.qdoc b/doc/src/android/androiddev.qdoc
index 07a4f62b34..5f01a32b82 100644
--- a/doc/src/android/androiddev.qdoc
+++ b/doc/src/android/androiddev.qdoc
@@ -137,8 +137,8 @@
\list 1
- \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Android to add paths to the
- Android NDK and SDK.
+ \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Devices >
+ \uicontrol Android to add paths to the Android NDK and SDK.
You can use the \inlineimage download.png
(\uicontrol Download) buttons to go to the sites where you can download
@@ -219,7 +219,8 @@
\section1 Using the Android Emulator
To run your application on the Android Emulator, you must create Android
- virtual devices (AVD). Select \uicontrol Tools > \uicontrol Options > \uicontrol Android >
+ virtual devices (AVD). Select \uicontrol Tools > \uicontrol Options >
+ \uicontrol Devices > \uicontrol Android >
\uicontrol 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.