diff --git a/doc/images/qtcreator-options-android1.png b/doc/images/qtcreator-options-android1.png index 1360b49cb61..a6086790f5b 100644 Binary files a/doc/images/qtcreator-options-android1.png and b/doc/images/qtcreator-options-android1.png differ diff --git a/doc/src/android/androiddev.qdoc b/doc/src/android/androiddev.qdoc index 247009d6f01..5d57ce1beb3 100644 --- a/doc/src/android/androiddev.qdoc +++ b/doc/src/android/androiddev.qdoc @@ -69,12 +69,25 @@ \endlist \li A tool chain for building applications for Android devices provided - by the - \l{http://developer.android.com/sdk/index.html}{Android SDK} and - \l{http://developer.android.com/tools/sdk/ndk/index.html} + by the \l{http://developer.android.com/tools/sdk/ndk/index.html} {Android NDK} from Google. - \note Android Studio is currently not supported by \QC. + \li \l{http://developer.android.com/sdk/index.html}{Android SDK Tools} + + After installing the Tools, update the Android SDK to get the API + and tools packages required for development. You can use the + \l{http://developer.android.com/tools/help/android.html}{android} + tool that comes with the SDK Tools package. For example, on Ubuntu + the following command starts the SDK update: + + \code + ./android update sdk + \endcode + + \note The android tool is deprecated since SDK tools version 25.3.0. + Consider using + \l{https://developer.android.com/studio/command-line/sdkmanager.html} + {sdkmanager} instead. \li On Windows, you also need the following: @@ -95,18 +108,6 @@ \endlist - After installing these tools, update the Android SDK to get the API - and tools packages required for development. You can use the - \l{http://developer.android.com/tools/help/android.html}{android} tool - that comes with the SDK Tools package. For example, on Ubuntu the - following command starts the - \l{http://developer.android.com/sdk/installing/adding-packages.html} - {Android SDK Manager}, where you can select the packages to install: - - \code - ./android update sdk - \endcode - \section1 Selecting the APK Build Tool On Android, applications are distributed in specially structured type of ZIP @@ -117,7 +118,7 @@ \li It is 25 to 50 percent faster than Ant when rebuilding packages. - \li It is integrated with Android Studio. + \li It is delivered with Qt 5.9. \li It supports easily adding Android Extras libraries, such as Google Play services or Android extension files (.obb) to your @@ -125,6 +126,10 @@ \endlist + \note Android SDK tools version 25.3.0 onwards do not contain Ant scripts + anymore. Therefore, Gradle builds are forced and you must use Qt 5.9 or + later when using these tools versions. + \section1 Setting Up the Development Environment You must download and install the latest Android NDK and SDK, and update the