feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Doc: Fix links to QtAndroid functions

Browse Source 
Add a dependency to the Qt Android Extras module to the
doc configuration file to enable linking to the module.

Change-Id: I69271554f78a0d73fc44032f9310e9670b06961e
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Leena Miettinen
2020-04-20 12:10:19 +02:00
parent b7e5362e8f
commit faa8547b12
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/qtcreator/config/qtcreator-project.qdocconf
View File

@@ -35,7 +35,8 @@ examples.fileextensions += *.qml *.svg
HTML.extraimages = ../../config/images/commercial.png HTML.extraimages = ../../config/images/commercial.png
qhp.QtCreator.extraFiles = ../../config/images/commercial.png qhp.QtCreator.extraFiles = ../../config/images/commercial.png
depends += qtwidgets \ depends += qtandroidextras\
qtwidgets \
qtcmake \ qtcmake \
qtcore \ qtcore \
qtqml \ qtqml \

4
doc/qtcreator/src/android/deploying-android.qdoc
View File

@@ -319,8 +319,8 @@
\li In the \uicontrol Permissions field, you can specify the permissions that your \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 application needs. Starting from Android 6.0 (API 23), permissions have to be
requested at runtime (See \l{QtAndroidExtras}{requestPermissionsSync} or requested at runtime (see \l{QtAndroid::requestPermissionsSync()} or
\l{QtAndroidExtras}{requestPermissions}). For lower Android API levels, \l{QtAndroid::requestPermissions()}). For lower Android API levels,
users are asked to grant the permissions when they install the application. 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. Android OS then grants the application access to the appropriate data and features.