diff options
author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-16 16:02:08 +0300 |
---|---|---|
committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-16 20:55:10 +0300 |
commit | 581ac9a4add648412a220ee3edc3553c9edae06d (patch) | |
tree | 482ef6eeea985342f8e808925da25359a27c7f77 | |
parent | 675805e9eb0dc68a6e96622353073fd54161bdaf (diff) |
Android: bump default javac build versions to 8
Use -source 8 and -target 8 for javac by default.
Task-number: QTBUG-86282
Change-Id: I291beab4df166468972138822ca26f01c9666985
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
-rw-r--r-- | config_help.txt | 4 | ||||
-rw-r--r-- | mkspecs/features/java.prf | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config_help.txt b/config_help.txt index 7b918a7511..9752904a89 100644 --- a/config_help.txt +++ b/config_help.txt @@ -210,8 +210,8 @@ Build environment: [$ANDROID_NDK_HOST] -android-abis ....... Comma separated Android abis, default is: armeabi-v7a,arm64-v8a,x86,x86_64 - -android-javac-target Set the javac build target version [7] - -android-javac-source Set the javac build source version [7] + -android-javac-target Set the javac build target version [8] + -android-javac-source Set the javac build source version [8] -android-style-assets Automatically extract style assets from the device at run time. This option makes the Android style behave correctly, but also makes the Android platform plugin diff --git a/mkspecs/features/java.prf b/mkspecs/features/java.prf index 20dc719699..ed003e7ac7 100644 --- a/mkspecs/features/java.prf +++ b/mkspecs/features/java.prf @@ -23,10 +23,10 @@ javac.CONFIG += combine # Check for user defined javac build version javac_target_version = $$ANDROID_JAVAC_TARGET_VERSION -isEmpty(javac_target_version): javac_target_version = 7 +isEmpty(javac_target_version): javac_target_version = 8 javac_source_version = $$ANDROID_JAVAC_SOURCE_VERSION -isEmpty(javac_source_version): javac_source_version = 7 +isEmpty(javac_source_version): javac_source_version = 8 javac.commands = javac -source $$javac_source_version -target $$javac_target_version -Xlint:unchecked -bootclasspath $$ANDROID_JAR_FILE -cp $$shell_quote($$system_path($$join(JAVACLASSPATH, $$DIRLIST_SEPARATOR))) -d $$shell_quote($$CLASS_DIR) ${QMAKE_FILE_IN} |