diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2020-06-04 08:17:40 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2020-06-25 08:45:35 +0200 |
| commit | 6afc56ecb25d9f45e7cddd33f33ec548ba7baac5 (patch) | |
| tree | b89a342d42a019c60dd6eef1c407a739bc52ac94 /mkspecs | |
| parent | 20609e253ac07760a45cfea0662577933d4477f9 (diff) | |
Raise the Android SDK build requirement to lvl 28 - compile fix
First of all cmake and qmake used a different standard.
Secondly, the qmake logic enforced lvl 23 (if it was installed which
is the case on the failing machine). When this is combined with
f71a400bf61 which requires lvl 28 API to build, the android build fails to compile.
cmake logic was even worse as it enforced lvl 21 API to be used if installed.
This change requires pick to 5.15 as f71a400bf61 was picked as well.
Change-Id: I89a7193b711b8bf927d02907343a49d6f27082ce
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
(cherry picked from commit 21b5c7875cc39c575b14b190add676a5b96fb0b5)
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/android/sdk.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/android/sdk.prf b/mkspecs/features/android/sdk.prf index fe7b9a27bd..463d399a21 100644 --- a/mkspecs/features/android/sdk.prf +++ b/mkspecs/features/android/sdk.prf @@ -1,6 +1,6 @@ API_VERSION_TO_USE = $$(ANDROID_API_VERSION) isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = $$API_VERSION -isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = android-21 +isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = android-28 ANDROID_JAR_FILE = $$ANDROID_SDK_ROOT/platforms/$$API_VERSION_TO_USE/android.jar !exists($$ANDROID_JAR_FILE) { |