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/tools | |
| 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/tools')
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
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(':')); |