diff options
author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-08-13 17:39:22 +0300 |
---|---|---|
committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-08-28 10:23:18 +0300 |
commit | 00a1e5da7e1aea373a7e6be1d51e1573ff167dd8 (patch) | |
tree | ae80056ad21418a1290b5d2214376c53f07bb0b4 /src/corelib | |
parent | 949254d5e4f9551aac5af2dbae5dc5dfcedd6235 (diff) |
Android: add option to get app arguments with AndroidManifest.xml
AndroidManifest.xml file and the Android plugin already has a way
to provide commandline-arguments to app with the tag
"android.app.arguments". This change allow to set it from qmake/cmake
and allow Qt Creator to use that.
Task-number: QTCREATORBUG-23712
Change-Id: I3e680f40fd36ba6aaac7f344fb9509d2c3360e74
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/Qt5AndroidSupport.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/Qt5AndroidSupport.cmake b/src/corelib/Qt5AndroidSupport.cmake index 662dd87c1f..cb908a29c6 100644 --- a/src/corelib/Qt5AndroidSupport.cmake +++ b/src/corelib/Qt5AndroidSupport.cmake @@ -42,6 +42,7 @@ if (NOT ${PROJECT_NAME}-MultiAbiBuild) [=[{ "_description": "This file is created by CMake to be read by androiddeployqt and should not be modified by hand.", "application-binary": "@QT_ANDROID_APPLICATION_BINARY@", + "application-arguments": "@QT_ANDROID_APPLICATION_ARGUMENTS@", "architectures": { @QT_ANDROID_ARCHITECTURES@ }, @@ -99,6 +100,7 @@ if (NOT ${PROJECT_NAME}-MultiAbiBuild) generate_json_variable_list(ANDROID_DEPLOYMENT_DEPENDENCIES "deployment-dependencies") generate_json_variable_list(ANDROID_EXTRA_PLUGINS "android-extra-plugins") generate_json_variable(ANDROID_PACKAGE_SOURCE_DIR "android-package-source-directory") + generate_json_variable(ANDROID_APPLICATION_ARGUMENTS "android-application-arguments") generate_json_variable(ANDROID_VERSION_CODE "android-version-code") generate_json_variable(ANDROID_VERSION_NAME "android-version-name") generate_json_variable_list(ANDROID_EXTRA_LIBS "android-extra-libs") |