summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/global/externalsites/external-resources.qdoc4
-rw-r--r--src/android/templates/doc/src/android-manifest-file-configuration.qdoc7
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc
index 6ba1e21380..1ef261caf6 100644
--- a/doc/global/externalsites/external-resources.qdoc
+++ b/doc/global/externalsites/external-resources.qdoc
@@ -53,6 +53,10 @@
\title Android: Verify Android App Links
*/
/*!
+ \externalpage https://source.android.com/devices/tech/debug/tagged-pointers
+ \title Android: Tagged Pointers
+*/
+/*!
\externalpage https://developer.apple.com/documentation/uikit/uiapplication/1622952-canopenurl
\title iOS: canOpenURL:
*/
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 24faef4c7b..64c2c82b44 100644
--- a/src/android/templates/doc/src/android-manifest-file-configuration.qdoc
+++ b/src/android/templates/doc/src/android-manifest-file-configuration.qdoc
@@ -109,6 +109,13 @@ Qt sets the following manifest configuration by default:
\li android:requestLegacyExternalStorage
\li Whether to use Android scoped storage. Default \c true.
\row
+ \li android:allowNativeHeapPointerTagging
+ \li Whether or not the app has the Heap pointer tagging feature enabled.
+ This has to be set to \c false when targeting Arm64 hardware with Android 11+
+ because it can break QML's NaN-tagging scheme.
+ For more information, see \l {Android: Tagged Pointers}{Tagged Pointers}.
+ The default value is \c false.
+\row
\li {1, 6} \l {Android: App Manifest <activity>}{<activity>}
\li android:name
\li The activity class name. Default: \c {org.qtproject.qt.android.bindings.QtActivity}.