diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/templates/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/corelib/Qt5AndroidSupport.cmake | 2 | ||||
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 10 |
3 files changed, 13 insertions, 1 deletions
diff --git a/src/android/templates/AndroidManifest.xml b/src/android/templates/AndroidManifest.xml index 092cf16545..62c6da5a32 100644 --- a/src/android/templates/AndroidManifest.xml +++ b/src/android/templates/AndroidManifest.xml @@ -17,7 +17,7 @@ </intent-filter> <!-- Application arguments --> - <!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ --> + <meta-data android:name="android.app.arguments" android:value="-- %%INSERT_APP_ARGUMENTS%% --"/> <!-- Application arguments --> <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/> 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") diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 9415554608..621d5554f0 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -167,6 +167,7 @@ struct Options QString outputDirectory; QString inputFileName; QString applicationBinary; + QString applicationArguments; QString rootPath; QStringList qmlImportPaths; QStringList qrcFiles; @@ -885,6 +886,14 @@ bool readInputFile(Options *options) } { + const QJsonValue applicationArguments = jsonObject.value(QLatin1String("android-application-arguments")); + if (!applicationArguments.isUndefined()) + options->applicationArguments = applicationArguments.toString(); + else + options->applicationArguments = QStringLiteral(""); + } + + { const QJsonValue androidVersionName = jsonObject.value(QLatin1String("android-version-name")); if (!androidVersionName.isUndefined()) options->versionName = androidVersionName.toString(); @@ -1430,6 +1439,7 @@ bool updateAndroidManifest(Options &options) QHash<QString, QString> replacements; replacements[QStringLiteral("-- %%INSERT_APP_NAME%% --")] = options.applicationBinary; + replacements[QStringLiteral("-- %%INSERT_APP_ARGUMENTS%% --")] = options.applicationArguments; replacements[QStringLiteral("-- %%INSERT_APP_LIB_NAME%% --")] = options.applicationBinary; replacements[QStringLiteral("-- %%INSERT_LOCAL_JARS%% --")] = options.localJars.join(QLatin1Char(':')); replacements[QStringLiteral("-- %%INSERT_INIT_CLASSES%% --")] = options.initClasses.join(QLatin1Char(':')); |