1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android:CMake: add a group for Android properties

Browse Source 
This allows to have a full list of up-to-date CMake properties
or variables to be shown in the Android docs.

Task-number: QTBUG-115020
Pick-to: 6.7
Change-Id: I6a75586432fc374f1b4affe0468cd55bad1a868f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Assam Boudjelthia 2023-12-17 00:42:06 +02:00
parent 138eebcc09
commit a5ce49cbeb
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/doc/src/cmake/cmake-configure-variables.qdoc
View File

@ -63,6 +63,7 @@ This variable is written out as part of the deployment settings for a target.
/*!
\page cmake-variable-qt-android-application-arguments.html
\ingroup cmake-variables-qtcore
\ingroup cmake-android-manifest-properties
\title QT_ANDROID_APPLICATION_ARGUMENTS
\target cmake-variable-QT_ANDROID_APPLICATION_ARGUMENTS
@ -82,6 +83,7 @@ is written out as part of the deployment settings for a target.
/*!
\page cmake-variable-qt-android-deploy-release.html
\ingroup cmake-variables-qtcore
\ingroup cmake-android-build-properties
\title QT_ANDROID_DEPLOY_RELEASE
\target cmake-variable-QT_ANDROID_DEPLOY_RELEASE
@ -103,6 +105,7 @@ using \l QT_ANDROID_DEPLOYMENT_TYPE instead.
/*!
\page cmake-variable-qt-android-deployment-type.html
\ingroup cmake-variables-qtcore
\ingroup cmake-android-build-properties
\title QT_ANDROID_DEPLOYMENT_TYPE
\target cmake-variable-QT_ANDROID_DEPLOYMENT_TYPE
@ -126,6 +129,7 @@ build types other than Debug.
/*!
\page cmake_variable-qt-android-multi-abi-forward-vars
\ingroup cmake-variables-qtcore
\ingroup cmake-android-build-properties
\title QT_ANDROID_MULTI_ABI_FORWARD_VARS
\target cmake-variable-QT_ANDROID_MULTI_ABI_FORWARD_VARS
@ -207,6 +211,7 @@ finalization occurs automatically when using CMake 3.19 or later.
/*!
\page cmake-variable-qt-android-build-all-abis.html
\ingroup cmake-variables-qtcore
\ingroup cmake-android-build-properties
\title QT_ANDROID_BUILD_ALL_ABIS
\target cmake-variable-QT_ANDROID_BUILD_ALL_ABIS
@ -240,6 +245,7 @@ The variable is set to \c FALSE by default.
/*!
\page cmake-variable-qt-android-abis.html
\ingroup cmake-variables-qtcore
\ingroup cmake-android-build-properties
\title QT_ANDROID_ABIS
\target cmake-variable-QT_ANDROID_ABIS
@ -284,6 +290,7 @@ Each variable can be used to specify the path to Qt for Android for the correspo
/*!
\page cmake-variable-qt-android-sign-aab.html
\ingroup cmake-variables-qtcore
\ingroup cmake-android-build-properties
\title QT_ANDROID_SIGN_AAB
\target cmake-variable-QT_ANDROID_SIGN_AAB
@ -309,6 +316,7 @@ The mentioned variables are used internally by \l{androiddeployqt}.
/*!
\page cmake-variable-qt-android-sign-apk.html
\ingroup cmake-variables-qtcore
\ingroup cmake-android-build-properties
\title QT_ANDROID_SIGN_APK
\target cmake-variable-QT_ANDROID_SIGN_APK

13
src/corelib/doc/src/cmake/cmake-properties.qdoc
View File

@ -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
@ -116,6 +118,7 @@ set_target_properties(MyApp PROPERTIES
\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
@ -147,6 +150,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
@ -166,6 +170,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
@ -199,6 +204,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
@ -218,6 +224,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
@ -241,6 +248,7 @@ CMake will attempt to use the latest installed version.
\title QT_ANDROID_VERSION_CODE
\target cmake-target-property-QT_ANDROID_VERSION_CODE
\ingroup cmake-android-manifest-properties
\summary {Internal Android app version.}
@ -263,6 +271,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.}
@ -282,6 +291,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
@ -348,6 +358,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
@ -368,6 +379,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
@ -385,6 +397,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