whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Assam Boudjelthia 2020-09-16 16:02:08 +03:00
parent 675805e9eb
commit 581ac9a4ad
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config_help.txt
View File

@ -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

4
mkspecs/features/java.prf
View File

@ -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}