aboutsummaryrefslogtreecommitdiffstats
path: root/doc/qtcreator
diff options
context:
space:
mode:
authorTarja Sundqvist <tarja.sundqvist@qt.io>2020-06-05 12:38:25 +0300
committerTarja Sundqvist <tarja.sundqvist@qt.io>2020-06-08 13:44:20 +0000
commita68e6a4fb1179a6f82d6618a995f2c85d492d5e4 (patch)
tree6605f5bfb209af565ba659239869e0268e834bd0 /doc/qtcreator
parentbfcd1149eb688707a5495ce63f39e93bcf0c0a54 (diff)
Add Android services to the manifest editor documentation
Task-number: QTCREATORBUG-24075 Change-Id: Ifd3ec1ee52fede81eec4c18a3c5c5a23eb44132b Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'doc/qtcreator')
-rw-r--r--doc/qtcreator/images/qtcreator-android-manifest-editor.pngbin23925 -> 24028 bytes
-rw-r--r--doc/qtcreator/src/android/deploying-android.qdoc10
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/qtcreator/images/qtcreator-android-manifest-editor.png b/doc/qtcreator/images/qtcreator-android-manifest-editor.png
index cb03512e59..ef8af6cc78 100644
--- a/doc/qtcreator/images/qtcreator-android-manifest-editor.png
+++ b/doc/qtcreator/images/qtcreator-android-manifest-editor.png
Binary files differ
diff --git a/doc/qtcreator/src/android/deploying-android.qdoc b/doc/qtcreator/src/android/deploying-android.qdoc
index 0e00224c64..2437b7aaa2 100644
--- a/doc/qtcreator/src/android/deploying-android.qdoc
+++ b/doc/qtcreator/src/android/deploying-android.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -315,6 +315,14 @@
then, it will resize and set the three icon fields for low, medium, and high DPI icons
as needed.
+ \li In \uicontrol {Android services}, you can add and remove services. You must
+ enter at least a service class name for a new service. If you select
+ \uicontrol {Run in external process}, you also need to enter a process name.
+ If you select \uicontrol {Run in external library}, you need to enter a library name.
+ Service arguments are mandatory for a service that is not run in an external
+ library. For more information about writing service code and structure of services,
+ see \l{Android Services}.
+
\li In the \uicontrol Permissions field, you can specify the permissions that your
application needs. Starting from Android 6.0 (API 23), permissions have to be
requested at runtime (see \l{QtAndroid::requestPermissionsSync()} or