From faa8547b129f46281b9a743e223eb870bdd3890d Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 20 Apr 2020 12:10:19 +0200 Subject: [PATCH] Doc: Fix links to QtAndroid functions 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 --- doc/qtcreator/config/qtcreator-project.qdocconf | 3 ++- doc/qtcreator/src/android/deploying-android.qdoc | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/qtcreator/config/qtcreator-project.qdocconf b/doc/qtcreator/config/qtcreator-project.qdocconf index a9a0ef579d1..414ac30c9a0 100644 --- a/doc/qtcreator/config/qtcreator-project.qdocconf +++ b/doc/qtcreator/config/qtcreator-project.qdocconf @@ -35,7 +35,8 @@ examples.fileextensions += *.qml *.svg HTML.extraimages = ../../config/images/commercial.png qhp.QtCreator.extraFiles = ../../config/images/commercial.png -depends += qtwidgets \ +depends += qtandroidextras\ + qtwidgets \ qtcmake \ qtcore \ qtqml \ diff --git a/doc/qtcreator/src/android/deploying-android.qdoc b/doc/qtcreator/src/android/deploying-android.qdoc index 966b1d629e4..c4ece062167 100644 --- a/doc/qtcreator/src/android/deploying-android.qdoc +++ b/doc/qtcreator/src/android/deploying-android.qdoc @@ -319,8 +319,8 @@ \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{QtAndroidExtras}{requestPermissionsSync} or - \l{QtAndroidExtras}{requestPermissions}). For lower Android API levels, + requested at runtime (see \l{QtAndroid::requestPermissionsSync()} or + \l{QtAndroid::requestPermissions()}). For lower Android API levels, 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.