summaryrefslogtreecommitdiffstats
path: root/src/tools/androiddeployqt/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/androiddeployqt/main.cpp')
-rw-r--r--src/tools/androiddeployqt/main.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index 97e5c9eb69..2799f97fe8 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -169,6 +169,8 @@ struct Options
// Versioning
QString versionName;
QString versionCode;
+ QByteArray minSdkVersion{"21"};
+ QByteArray targetSdkVersion{"28"};
// lib c++ path
QString stdCppPath;
@@ -850,6 +852,18 @@ bool readInputFile(Options *options)
}
{
+ const QJsonValue ver = jsonObject.value(QLatin1String("android-min-sdk-version"));
+ if (!ver.isUndefined())
+ options->minSdkVersion = ver.toString().toUtf8();
+ }
+
+ {
+ const QJsonValue ver = jsonObject.value(QLatin1String("android-target-sdk-version"));
+ if (!ver.isUndefined())
+ options->targetSdkVersion = ver.toString().toUtf8();
+ }
+
+ {
const QJsonObject targetArchitectures = jsonObject.value(QLatin1String("architectures")).toObject();
if (targetArchitectures.isEmpty()) {
fprintf(stderr, "No target architecture defined in json file.\n");
@@ -2298,6 +2312,8 @@ bool buildAndroidProject(const Options &options)
gradleProperties["buildDir"] = "build";
gradleProperties["qt5AndroidDir"] = (options.qtInstallDirectory + QLatin1String("/src/android/java")).toUtf8();
gradleProperties["androidCompileSdkVersion"] = options.androidPlatform.split(QLatin1Char('-')).last().toLocal8Bit();
+ gradleProperties["qtMinSdkVersion"] = options.minSdkVersion;
+ gradleProperties["qtTargetSdkVersion"] = options.targetSdkVersion;
if (gradleProperties["androidBuildToolsVersion"].isEmpty())
gradleProperties["androidBuildToolsVersion"] = options.sdkBuildToolsVersion.toLocal8Bit();