1 files changed, 114 insertions, 1 deletions
diff --git a/src/corelib/doc/src/cmake/cmake-properties.qdoc b/src/corelib/doc/src/cmake/cmake-properties.qdoc
index a7ad6c75da..4b602d5d07 100644
--- a/src/corelib/doc/src/cmake/cmake-properties.qdoc
+++ b/src/corelib/doc/src/cmake/cmake-properties.qdoc
@@ -16,6 +16,7 @@ target properties:
 \page cmake-target-property-qt-android-deployment-dependencies.html
 \ingroup cmake-properties-qtcore
 \ingroup cmake-target-properties-qtcore
+\ingroup cmake-android-build-properties
 
 \title QT_ANDROID_DEPLOYMENT_DEPENDENCIES
 \target cmake-target-property-QT_ANDROID_DEPLOYMENT_DEPENDENCIES
@@ -47,6 +48,7 @@ is listed before its dependencies, it will fail to load on some devices.
 \page cmake-target-property-qt-android-extra-libs.html
 \ingroup cmake-properties-qtcore
 \ingroup cmake-target-properties-qtcore
+\ingroup cmake-android-build-properties
 
 \title QT_ANDROID_EXTRA_LIBS
 \target cmake-target-property-QT_ANDROID_EXTRA_LIBS
@@ -85,6 +87,33 @@ library to the MyApp dependencies:
 add_dependencies(MyApp MyService)
 \endcode
 
+When adding per-architecture libraries to a multi-abi project,
+list all their paths explicitly, rather than rely on variables like
+\c CMAKE_ANDROID_ARCH_ABI to dynamically compute the paths.
+
+Prefer:
+
+\badcode
+set(libs
+    ${CMAKE_CURRENT_BINARY_DIR}/libA_x86so
+    ${CMAKE_CURRENT_BINARY_DIR}/libA_x86_64.so
+    ${CMAKE_CURRENT_BINARY_DIR}/libA_arm64-v8a.so
+    ${CMAKE_CURRENT_BINARY_DIR}/libA_armeabi-v7a.so
+)
+set_target_properties(MyApp PROPERTIES QT_ANDROID_EXTRA_LIBS ${libs})
+
+# When targeting precompiled libs
+target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC libA_${ANDROID_ABI})
+\endcode
+
+over:
+
+\badcode
+set_target_properties(MyApp PROPERTIES
+    QT_ANDROID_EXTRA_LIBS
+        ${CMAKE_CURRENT_BINARY_DIR}/libA_${CMAKE_ANDROID_ARCH_ABI}.so)
+\endcode
+
 \sa{qt6_android_generate_deployment_settings}{qt_android_generate_deployment_settings()}
 */
 
@@ -92,6 +121,7 @@ add_dependencies(MyApp MyService)
 \page cmake-target-property-qt-android-extra-plugins.html
 \ingroup cmake-properties-qtcore
 \ingroup cmake-target-properties-qtcore
+\ingroup cmake-android-build-properties
 
 \title QT_ANDROID_EXTRA_PLUGINS
 \target cmake-target-property-QT_ANDROID_EXTRA_PLUGINS
@@ -123,6 +153,7 @@ mangling is applied to the plugin library.
 \page cmake-target-property-qt-android-min-sdk-version.html
 \ingroup cmake-properties-qtcore
 \ingroup cmake-target-properties-qtcore
+\ingroup cmake-android-build-properties
 
 \title QT_ANDROID_MIN_SDK_VERSION
 \target cmake-target-property-QT_ANDROID_MIN_SDK_VERSION
@@ -142,6 +173,7 @@ Specifies the minimum Android API level for the target.
 \page cmake-target-property-qt-android-package-source-dir.html
 \ingroup cmake-properties-qtcore
 \ingroup cmake-target-properties-qtcore
+\ingroup cmake-android-build-properties
 
 \title QT_ANDROID_PACKAGE_SOURCE_DIR
 \target cmake-target-property-QT_ANDROID_PACKAGE_SOURCE_DIR
@@ -175,6 +207,7 @@ then place this directly into the directory specified by this variable.
 \page cmake-target-property-qt-android-target-sdk-version.html
 \ingroup cmake-properties-qtcore
 \ingroup cmake-target-properties-qtcore
+\ingroup cmake-android-build-properties
 
 \title QT_ANDROID_TARGET_SDK_VERSION
 \target cmake-target-property-QT_ANDROID_TARGET_SDK_VERSION
@@ -194,6 +227,7 @@ Specifies the target Android API level for the target.
 \page cmake-target-property-qt-android-sdk-build-tools-revision.html
 \ingroup cmake-properties-qtcore
 \ingroup cmake-target-properties-qtcore
+\ingroup cmake-android-build-properties
 
 \title QT_ANDROID_SDK_BUILD_TOOLS_REVISION
 \target cmake-target-property-QT_ANDROID_SDK_BUILD_TOOLS_REVISION
@@ -211,12 +245,63 @@ CMake will attempt to use the latest installed version.
 */
 
 /*!
+\page cmake-target-property-qt-android-package-name.html
+\ingroup cmake-properties-qtcore
+\ingroup cmake-target-properties-qtcore
+\ingroup cmake-android-build-properties
+
+\title QT_ANDROID_PACKAGE_NAME
+\target cmake-target-property-QT_ANDROID_PACKAGE_NAME
+
+\summary {The app's package name.}
+
+\cmakepropertysince 6.8
+\preliminarycmakeproperty
+\cmakepropertyandroidonly
+
+Specifies the app's package name. This is usually a unique dot separated
+name for the app, that will be used to identify the app on devices or in
+the Play Store. For example, "org.qtproject.example.gallery".
+
+The package name set by this property is passed to the \c build.gradle file
+as a \c namespace property, instead of \c AndroidManifest.xml, since the
+latter is deprecated since Android Gradle Plugin 7.4.
+
+The package name considers some words or characters as illegal and the build
+will clean such names if any is encountered. An underscore (\c _) either replaces
+illegal characters or is appended to illegal words.
+
+\list
+    \li Allowed characters: alphanumeric, an underscore or a dot [a-zA-Z0-9_.].
+    \li Illegal words: abstract, continue, for, new, switch, assert, default,
+        if, package, synchronized, boolean, do, goto, private, this, break,
+        double, implements, protected, throw, byte, else, import, public,
+        throws, case, enum, instanceof, return, transient, catch, extends,
+        int, short, try, char, final, interface, static, void, class, finally,
+        long, strictfp, volatile, const, float, native, super, while.
+\endlist
+
+The default package name for Qt for Android apps is \c org.qtproject.example.<target_name>.
+
+\note Setting the package name manually in \c build.gradle (via
+\c namespace property) takes precedence over \c AndroidManifest.xml
+(via \c package attribute), and the latter also takes precedence over
+this property.
+
+For more information, see Android's
+\l{Android: Configure the app module}{configure the app module}.
+
+\sa{qt6_android_generate_deployment_settings}{qt_android_generate_deployment_settings()}
+*/
+
+/*!
 \page cmake-target-property-qt-android-version-code.html
 \ingroup cmake-properties-qtcore
 \ingroup cmake-target-properties-qtcore
 
 \title QT_ANDROID_VERSION_CODE
 \target cmake-target-property-QT_ANDROID_VERSION_CODE
+\ingroup cmake-android-manifest-properties
 
 \summary {Internal Android app version.}
 
@@ -239,6 +324,7 @@ For more information, see \l{Android: App Versioning}{Android App Versioning}.
 
 \title QT_ANDROID_VERSION_NAME
 \target cmake-target-property-QT_ANDROID_VERSION_NAME
+\ingroup cmake-android-manifest-properties
 
 \summary {Human-readable Android app version.}
 
@@ -258,6 +344,7 @@ For more information, see \l{Android: App Versioning}{Android App Versioning}.
 \page cmake-target-property-qt-android-abis.html
 \ingroup cmake-properties-qtcore
 \ingroup cmake-target-properties-qtcore
+\ingroup cmake-android-build-properties
 
 \title QT_ANDROID_ABIS
 \target cmake-target-property-QT_ANDROID_ABIS
@@ -324,6 +411,7 @@ For application-specific QML imports, use
 \page cmake-target-property-qt-android-deployment-settings-file.html
 \ingroup cmake-properties-qtcore
 \ingroup cmake-target-properties-qtcore
+\ingroup cmake-android-build-properties
 
 \title QT_ANDROID_DEPLOYMENT_SETTINGS_FILE
 \target cmake-target-property-QT_ANDROID_DEPLOYMENT_SETTINGS_FILE
@@ -344,6 +432,7 @@ and overwritten by that command.
 \page cmake-target-property-qt-android-system-libs-prefix.html
 \ingroup cmake-properties-qtcore
 \ingroup cmake-target-properties-qtcore
+\ingroup cmake-android-build-properties
 
 \title QT_ANDROID_SYSTEM_LIBS_PREFIX
 \target cmake-target-property-QT_ANDROID_SYSTEM_LIBS_PREFIX
@@ -361,6 +450,7 @@ when those libraries are installed outside app's native (JNI) library directory.
 \page cmake-target-property-qt-android-no-deploy-qt-libs.html
 \ingroup cmake-properties-qtcore
 \ingroup cmake-target-properties-qtcore
+\ingroup cmake-android-build-properties
 
 \title QT_ANDROID_NO_DEPLOY_QT_LIBS
 \target cmake-target-property-QT_ANDROID_NO_DEPLOY_QT_LIBS
@@ -453,7 +543,7 @@ the property value overrides the runtime path where the resource file is found.
 
 \summary {Specifies that the given files should be empty in the resource file system}
 
-\cmakepropertysince 6.5
+\cmakepropertysince 6.6
 \preliminarycmakeproperty
 
 When using the target-based variant of \l{qt6_add_resources}{qt_add_resources}
@@ -555,6 +645,29 @@ For more information, see \l{https://github.com/emscripten-core/emscripten/blob/
 */
 
 /*!
+\page cmake-target-property-qt-wasm-maximum-memory.html
+\ingroup cmake-properties-qtcore
+\ingroup cmake-target-properties-qtcore
+
+\title QT_WASM_MAXIMUM_MEMORY
+\target cmake-target-property-QT_WASM_MAXIMUM_MEMORY
+
+\summary {Internal WebAssembly maximum memory.}
+
+\cmakepropertysince 6.7
+\preliminarycmakeproperty
+\cmakepropertywebassemblyonly
+
+Specifies the maximum amount of memory the application can use. Translates into
+the Emscripten compiler setting of \c MAXIMUM_MEMORY. The default value
+is 4GB, which is the maximum for 32-bit WebAssembly.
+
+For more information, see the \l{https://github.com/emscripten-core/emscripten/blob/3319a313d3b589624d342b650884caaf8cd9ef30/src/settings.js#L187}{Emscripten compiler settings}.
+*/
+
+
+
+/*!
 \page cmake-target-property-qt-ios-launch-screen.html
 \ingroup cmake-properties-qtcore
 \ingroup cmake-target-properties-qtcore