From 057c405bddb2ad1561f917b057d048caf2103564 Mon Sep 17 00:00:00 2001 From: Juha Vuolle Date: Wed, 30 Oct 2024 10:43:10 +0200 Subject: [PATCH] Fix Qt version in Android permission documentation The changes that decouple location permission from bluetooth permissions, as well as allow application manifest to overwrite permissions set by Qt modules, have been backported from Qt 6.9 to Qt 6.8.1. This same documentation change was already done in those manual cherry-picks / backports. Task-number: QTBUG-129944 Change-Id: If08b39e653257eeab8661eae1a7b483dbd01487b Reviewed-by: Assam Boudjelthia --- .../templates/doc/src/android-manifest-file-configuration.qdoc | 2 +- src/corelib/kernel/qpermissions.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/android/templates/doc/src/android-manifest-file-configuration.qdoc b/src/android/templates/doc/src/android-manifest-file-configuration.qdoc index 51a4679fb72..cfc3b1c2f6d 100644 --- a/src/android/templates/doc/src/android-manifest-file-configuration.qdoc +++ b/src/android/templates/doc/src/android-manifest-file-configuration.qdoc @@ -254,7 +254,7 @@ might not work properly. \section3 Customizing Permissions -Since Qt 6.9, it is possible to override the default permissions set +Since Qt 6.8.1, it is possible to override the default permissions set by Qt modules. This is useful if you need to define the same permissions as used by a Qt module, but with additional or different attributes. diff --git a/src/corelib/kernel/qpermissions.cpp b/src/corelib/kernel/qpermissions.cpp index f67756bca52..bfe8087d969 100644 --- a/src/corelib/kernel/qpermissions.cpp +++ b/src/corelib/kernel/qpermissions.cpp @@ -374,7 +374,7 @@ QT_PERMISSION_IMPL_COMMON(QMicrophonePermission) \endlist \include permissions.qdocinc end-usage-declarations - \note Since Qt 6.9, the ACCESS_FINE_LOCATION permission is no longer + \note Since Qt 6.8.1, the ACCESS_FINE_LOCATION permission is no longer requested if API Level >= 31. This \l {Android Bluetooth Permissions}{may limit some Bluetooth scan results}. Users needing these results need