diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2023-04-04 12:36:24 +0100 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2023-04-05 12:38:15 +0100 |
| commit | a43f349f9c2259966e6d6e94d31dd64a1156b17b (patch) | |
| tree | 3d3867958595e7cd149d625e95d0c918339b4bc4 /src/android/templates | |
| parent | 4521dfe75ad147fc5510702b33189dd2faed93fd (diff) | |
Android: allow using string based versions in compileSdkVersion
Some platform sdk packages have names that contains non-integer
characters such as android-33-ext5 or android-UpsideDownCake
which fail building with androiddeployqt because build.gradle
expects an integer only. This allows using string based versions
and also fallbacks to setting an integer only value if it finds
that the build.gradle of the project is still explicitly
converting to integer (this to avoid breaking existing projects).
Fixes: QTBUG-112465
Pick-to: 6.5 6.2 5.15
Change-Id: If8cfc0fb84f0880a43644dc0a4188671736d3e21
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Diffstat (limited to 'src/android/templates')
| -rw-r--r-- | src/android/templates/build.gradle | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/android/templates/build.gradle b/src/android/templates/build.gradle index 33867903c2..fbd0a48fe6 100644 --- a/src/android/templates/build.gradle +++ b/src/android/templates/build.gradle @@ -35,7 +35,7 @@ android { * Changing them manually might break the compilation! *******************************************************/ - compileSdkVersion androidCompileSdkVersion.toInteger() + compileSdkVersion androidCompileSdkVersion buildToolsVersion androidBuildToolsVersion ndkVersion androidNdkVersion |