From 028a31b50574f8e850d4c67c2892f7ed22a073bb Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Fri, 20 Oct 2023 14:32:39 +0300
Subject: [PATCH] Android: remove unneeded allowNativeHeapPointerTagging
 manifest flag

Amends b0907db9eae4b85fcab4fa997428c438d9443ee0.

Pick-to: 6.5 6.6
Task-number: QTBUG-91150
Change-Id: Ic7886a9fc69781e4f21417075516106ccb6c7bf5
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
---
 src/android/templates/AndroidManifest.xml                  | 1 -
 .../doc/src/android-manifest-file-configuration.qdoc       | 7 -------
 .../corelib/permissions/android/AndroidManifest.xml        | 1 -
 tests/manual/permissions/android/AndroidManifest.xml       | 1 -
 4 files changed, 10 deletions(-)

diff --git a/src/android/templates/AndroidManifest.xml b/src/android/templates/AndroidManifest.xml
index 8f91863719..39f685234b 100644
--- a/src/android/templates/AndroidManifest.xml
+++ b/src/android/templates/AndroidManifest.xml
@@ -16,7 +16,6 @@
         android:hardwareAccelerated="true"
         android:label="-- %%INSERT_APP_NAME%% --"
         android:requestLegacyExternalStorage="true"
-        android:allowNativeHeapPointerTagging="false"
         android:allowBackup="true"
         android:fullBackupOnly="false">
         <activity
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 8b54536a33..f44617a95d 100644
--- a/src/android/templates/doc/src/android-manifest-file-configuration.qdoc
+++ b/src/android/templates/doc/src/android-manifest-file-configuration.qdoc
@@ -81,13 +81,6 @@ Qt sets the following manifest configuration by default:
 \row
     \li android:requestLegacyExternalStorage
     \li Whether to use Android scoped storage. The default value is \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 android:allowBackup
     \li Whether to allow the application to participate in the backup and restore
diff --git a/tests/manual/examples/corelib/permissions/android/AndroidManifest.xml b/tests/manual/examples/corelib/permissions/android/AndroidManifest.xml
index 557ec8007e..44ed54390a 100644
--- a/tests/manual/examples/corelib/permissions/android/AndroidManifest.xml
+++ b/tests/manual/examples/corelib/permissions/android/AndroidManifest.xml
@@ -26,7 +26,6 @@
         android:hardwareAccelerated="true"
         android:label="-- %%INSERT_APP_NAME%% --"
         android:requestLegacyExternalStorage="true"
-        android:allowNativeHeapPointerTagging="false"
         android:allowBackup="true"
         android:fullBackupOnly="false">
         <activity
diff --git a/tests/manual/permissions/android/AndroidManifest.xml b/tests/manual/permissions/android/AndroidManifest.xml
index 557ec8007e..44ed54390a 100644
--- a/tests/manual/permissions/android/AndroidManifest.xml
+++ b/tests/manual/permissions/android/AndroidManifest.xml
@@ -26,7 +26,6 @@
         android:hardwareAccelerated="true"
         android:label="-- %%INSERT_APP_NAME%% --"
         android:requestLegacyExternalStorage="true"
-        android:allowNativeHeapPointerTagging="false"
         android:allowBackup="true"
         android:fullBackupOnly="false">
         <activity