diff --git a/doc/images/qtcreator-android-deploy-configurations.png b/doc/images/qtcreator-android-deploy-configurations.png index ea3f9a95053..8cd0a220036 100644 Binary files a/doc/images/qtcreator-android-deploy-configurations.png and b/doc/images/qtcreator-android-deploy-configurations.png differ diff --git a/doc/images/qtcreator-android-manifest-editor.png b/doc/images/qtcreator-android-manifest-editor.png index 31ac17eb1ca..1f9e581de1d 100644 Binary files a/doc/images/qtcreator-android-manifest-editor.png and b/doc/images/qtcreator-android-manifest-editor.png differ diff --git a/doc/src/android/deploying-android.qdoc b/doc/src/android/deploying-android.qdoc index a1202e5d7b1..9edf35f52cc 100644 --- a/doc/src/android/deploying-android.qdoc +++ b/doc/src/android/deploying-android.qdoc @@ -45,8 +45,8 @@ \endlist - To specify the deployment method, select \gui Projects > \gui Run > - \gui {Deploy configurations} > \gui Details. + To specify settings for application packages, select \gui Projects > + \gui {Build Android APK} > \gui Details. \section1 Creating Distributable APK Packages @@ -86,10 +86,6 @@ deploy Qt libraries to the \c{/data/local/tmp/qt} folder on the device and to run the application against them. - To deploy new Qt libraries to the device, select - \gui {Clean Temporary Libraries Directory on Device}. The next time you - deploy the application, Qt libraries are copied to the device again. - \section1 Packaging Applications Because bundling applications as APK packages is not @@ -114,13 +110,24 @@ \li Libraries and QML files, which can be included in the project depending on the deployment method that you select. + \li Gradle wrappers that are needed to download and use Gradle. + + \li Gradle script that is needed by Java IDEs, such as Android Studio. + It allows the user to extend the Java part without copying our Java + sources. It also allows the IDEs to provide code completion, syntax + highlighting, and so on. + \endlist + The Gradle wrappers and scripts are bundled only if you use Gradle, which is + the default. To use Ant instead, deselect the \gui {Use Gradle} check box. + To view the packages that the \c androiddeployqt tool created, select the \gui {Open package location after build} check box. The packages are deployed on the connected Android devices. To switch the device used as a default device for the selected kit, select + \gui Projects > \gui Run > \gui {Reset Default Devices}. The setting applies until you restart \QC. For more information, see \l{Selecting Android Devices}. @@ -130,8 +137,8 @@ \section2 Specifying Settings for Packages You can specify settings for the \c androiddeployqt tool in \QC and in the - project .pro file. To specify settings in \QC, select - \gui Projects > \gui Run > \gui {Deploy configurations} > \gui Details. + project .pro file. To specify settings in \QC, select \gui Projects > + \gui {Build Android APK} > \gui Details. \image qtcreator-android-deploy-configurations.png "Deploy configurations" @@ -161,7 +168,7 @@ In the \gui {Sign Package} group you can sign the Android package by using a private key from the keystore. To create new keys, select \gui Create. - \section2 Adding External Libraries + \section3 Adding External Libraries \QC automatically detects which Qt libraries the application uses and adds them as dependencies. If the application needs external libraries, specify @@ -172,6 +179,62 @@ required \c libssl.so and \c libcrypto.so libraries to the \gui {Additional Libraries} field. + \section3 Editing Manifest Files + + You can use the qmake variables to specify all + the settings you need for the \c androiddeployqt tool and you do not need an + Android manifest file until you want to publish the package in an + application store. To specify additional settings for APK packages, you can + create an Android manifest file and edit it in \QC. Select + \gui {Create Templates} to create the file and to open it in the + Android Manifest Editor. + + \image qtcreator-android-manifest-editor.png "Android Manifest Editor" + + \list 1 + + \li In the \gui {Package name} field, enter a package name for the application. + The application is launched by an automatically generated Java launcher that + is packaged with the application into an Android package (.apk). For more + information, see + \l{http://developer.android.com/guide/components/fundamentals.html} + {Android Application Fundamentals}. + + \li You can specify an internal version number for the package in the + \gui {Version code} field. It is used to determine whether one version of + the application is more recent than another. In the \gui {Version name} + field, specify the version number that is shown to users. + + \li In the \gui {Minimum required SDK} field, select the minimum API level + required to run the application. The minimum supported API level is + android-9. \QC does not allow you to select an API + level that the Qt version specified for the kit does not support. + + \li In the \gui {Target SDK} field, select the targeted API level of the + application. This affects the activation of some compatibility features in + the OS. The value used by the \c androiddeployqt tool by default is 14, which + means that the overflow button in the system navigation bar will not be + enabled by default. + + \li In the \gui Application group, you can give the application a name and + select an icon for it. The three icon fields can contain different versions + of the icon with low, medium, and high DPI values, from left to right. + + \li In the \gui Permissions field, you can specify the permissions that your + application needs. Users are asked to grant the permissions when they + install the application. Android OS then grants the application access to + the appropriate data and features. + + \li Select the \gui {Include default permissions for Qt modules} and + \gui {Include default features for Qt modules} check boxes to add the + permissions needed by Qt libraries. + + \li To add permissions, select them in the list, and then select \gui Add. + + \endlist + + Select the \gui {XML Source} tab to edit the file in XML format. + \section1 Installing Ministro The easiest way to install Ministro is to do it on the device via Google @@ -182,62 +245,12 @@ from the Google Market or from the \l{http://necessitas.kde.org/necessitas/ministro.php}{Ministro} home page. - Then select \gui {Install Ministro from APK}. + Then select \gui Projects > \gui Run > \gui {Install Ministro from APK}. You can use this option also to install any Android package (.apk). You can use this option to install applications on an Android Virtual Device (AVD). - \section1 Editing Manifest Files - - You can use the qmake variables to specify all - the settings you need for the \c androiddeployqt tool and you do not need an - Android manifest file until you want to publish the package in an - application store. To specify additional settings for APK packages, you can - create an Android manifest file and edit it in \QC. Select - \gui {Create AndroidManifest.xml} to create the file and to open it in the - Android Manifest Editor. - - \image qtcreator-android-manifest-editor.png "Android Manifest Editor" - - Select the \gui {XML Source} tab to edit the file in XML format. - - In the \gui {Package name} field, enter a package name for the application. - The application is launched by an automatically generated Java launcher that - is packaged with the application into an Android package (.apk). For more - information, see - \l{http://developer.android.com/guide/components/fundamentals.html} - {Android Application Fundamentals}. - - You can specify an internal version number for the package in the - \gui {Version code} field. It is used to determine whether one version of - the application is more recent than another. In the \gui {Version name} - field, specify the version number that is shown to users. - - In the \gui {Minimum required SDK} field, select the minimum API level - required to run the application. The minimum supported API level is - android-9. \QC does not allow you to select an API - level that the Qt version specified for the kit does not support. - - In the \gui {Target SDK} field, select the targeted API level of the - application. This affects the activation of some compatibility features in - the OS. The value used by the \c androiddeployqt tool by default is 14, which - means that the overflow button in the system navigation bar will not be - enabled by default. - - In the \gui Application group, you can give the application a name and - select an icon for it. The three icon fields can contain different versions - of the icon with low, medium, and high DPI values, from left to right. - - In the \gui Permissions field, you can specify the permissions that your - application needs. Users are asked to grant the permissions when they - install the application. Android OS then grants the application access to - the appropriate data and features. - - Select the \gui {Include default permissions and features for Qt modules} - check box to add the permissions needed by Qt libraries. - - To add permissions, select them in the list, and then select \gui Add. */