diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-11 11:07:44 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-16 20:55:08 +0300 |
| commit | 675805e9eb0dc68a6e96622353073fd54161bdaf (patch) | |
| tree | a8ce4a62579d67bb0e810bfe18e37ad40853cfeb /configure.pri | |
| parent | 5ce24fab73d8e742db98e42902e544caac5e5cc8 (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
Pick-to: 5.15
Change-Id: I36b0665de2c31e16bf6d138859b5503455eb8e66
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.pri b/configure.pri index bd282df0aa..a04aa17236 100644 --- a/configure.pri +++ b/configure.pri @@ -627,12 +627,17 @@ defineTest(qtConfOutput_prepareOptions) { isEmpty(platform): \ platform = android-23 + android_javac_target = $$eval(config.input.android-javac-target) + android_javac_source = $$eval(config.input.android-javac-source) + $${currentConfig}.output.devicePro += \ "DEFAULT_ANDROID_SDK_ROOT = $$val_escape(sdk_root)" \ "DEFAULT_ANDROID_NDK_ROOT = $$val_escape(ndk_root)" \ "DEFAULT_ANDROID_PLATFORM = $$platform" \ "DEFAULT_ANDROID_NDK_HOST = $$ndk_host" \ - "DEFAULT_ANDROID_ABIS = $$split(android_abis, ',')" + "DEFAULT_ANDROID_ABIS = $$split(android_abis, ',')" \ + "ANDROID_JAVAC_TARGET_VERSION = $$android_javac_target" \ + "ANDROID_JAVAC_SOURCE_VERSION = $$android_javac_source" } export($${currentConfig}.output.devicePro) |