summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2020-09-11 11:07:44 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-09-16 22:45:37 +0000
commit11cd29687c4e338f12112819d6eed28243b0394b (patch)
treeed95fa64fea5cbdfaf97d0b4725e7bc9a7aa1c95 /configure.json
parent09d79fb103dbe41da242a55e3dffc29793b03fe1 (diff)
Android: allow setting javac build version from the configure script
The configure options -android-javac-source and -android-javac-target can be used to set the version numbers. Fixes: QTBUG-86282 Change-Id: I36b0665de2c31e16bf6d138859b5503455eb8e66 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit 675805e9eb0dc68a6e96622353073fd54161bdaf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.json b/configure.json
index 50d69b740d..c273aeeef1 100644
--- a/configure.json
+++ b/configure.json
@@ -56,6 +56,8 @@
"android-ndk-host": "string",
"android-ndk-platform": "string",
"android-sdk": "string",
+ "android-javac-target": "string",
+ "android-javac-source": "string",
"android-style-assets": "boolean",
"appstore-compliant": "boolean",