Commit Graph

70 Commits

Author SHA1 Message Date
Rami Potinkara
76ff4d7046 Android: Android 16 as maximum supported version
This patch
- Replaces Android 15 with Android 16 as a maximum version
- Sets Android 16 as significant and switches to r07 version

Task-number: QTQAINFRA-7301
Task-number: QTQAINFRA-7298
Change-Id: Ic2ac071da7ab1763225c82e441c27f60cc25fe06
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
2025-10-23 07:36:44 +00:00
Rami Potinkara
88843f5d8b Provisioning: bump Android sdkBuildToolsVersion and sdkApiLevel to 36
This patch bumps:
-The sdkBuildToolsVersion used in Coin to 36.0.0
-The sdkApiLevel used in Coin to 36

Task-number: QTBUG-138550
Task-number: QTBUG-138549
Change-Id: Ic63cd28ba39743e517ea3a3e2f9ec08bd5dc3267
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
2025-10-23 07:36:43 +00:00
Elias Toivola
d6a6f98789 Android: Fix cache URLs
Pick-to: 6.9 6.8 6.5
Task-number: QTQAINFRA-7264
Task-number: QTQAINFRA-7265
Change-Id: I68cf0dc47c50bb7a817860d6607db5910225996a
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit c781ce2c92)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-28 15:06:23 +00:00
Assam Boudjelthia
cbbba28284 Android: update provisioning to Gradle 8.14.2 and AGP 8.10.1
Task-number: QTBUG-137782
Change-Id: I522a7179e1a0be7c7bb876d935fd02ef7e049475
Reviewed-by: Simo Fält <simo.falt@qt.io>
2025-09-09 06:19:44 +00:00
Elias Toivola
ac22ffaf57 Android: set nightly targets for older NDK versions
This change makes provisioning also install older NDKs for Android,
which will be used in nightly targets.

Task-number: QTQAINFRA-7069
Change-Id: Ia8695383e94df282822da9019c33f1004a879bf6
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 687b73cde0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-06-24 10:36:45 +00:00
Rami Potinkara
8f51576951 Coin: Add Android 16 to CI as insignificant
This patch introduces Android 16 as insignificant to CI.

Task-number: QTBUG-132638
Pick-to: 6.9 6.8
Change-Id: I29577503c50440d6b4821b1b7d6a5135935bf365
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2025-05-14 22:18:02 +03:00
Assam Boudjelthia
1c20066c69 Android: update the sha for Gradle script for provisioning
Use the sha from last update of Gradle and update AGP version
to match qtbase's 0e4f9ffa55c2b77fbe79e96362bc68a968982b48 commit.

Task-number: QTBUG-132852
Pick-to: 6.9
Change-Id: Iab851b08bc11290ee51a22f3bdd64369928dff22
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
2025-03-27 17:31:59 +00:00
Rami Potinkara
a242bb2e3e Provisioning: Update Android NDK to LTS version r27c
This patch updates Android NDK from LTS r26b to LTS r27c.
The version is 27.2.12479018

Task-number: QTQAINFRA-6479
Task-number: QTQAINFRA-6655
Pick-to: 6.9.0 6.9 6.8.3 6.8 6.5
Change-Id: Ic791cfd5d5dd2a439f96590b6f6f8ca0ac4fb5ae
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
2025-03-13 10:09:08 +00:00
Rami Potinkara
9e5bb886b0 Provisioning: bump Android sdkBuildToolsVersion to 35
This patch bumps the sdkBuildToolsVersion used in Coin to 35.

Task-number: QTBUG-129461
Task-number: QTBUG-130283
Pick-to: 6.9 6.8 6.5
Change-Id: I2e1fbdfd23cb854ec50625ff29331adc61abc32c
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2025-02-25 21:36:35 +02:00
Konsta Alajärvi
b0d999c087 Provisioning: bump Android sdkApiLevel to 35
This patch bumps the sdkApiLevel used in Coin to 35.

Task-number: QTBUG-129461
Task-number: QTBUG-130283
Pick-to: 6.9 6.8 6.5
Change-Id: Ia26248982a2807b2d3554d1a7a7394efcf13f834
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2025-02-25 21:36:17 +02:00
Rami Potinkara
2c85a91e07 Android: Android 15 as maximum supported version
This patch
- Replaces Android 14 with Android 15 as a maximum version
- Introduces Android 15 system image to CI cache
- Sets Android 15 as significant

Task-number: QTQAINFRA-6478
Fixes: QTQAINFRA-6652
Pick-to: 6.9 6.8 6.5
Change-Id: Icb6de43f3e2c2f7f98f3172c83d66bebf9603d24
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2025-01-11 10:31:58 +02:00
Elias Toivola
9078baf0a9 Android: update emulator version to 35.2.10
The newest stable version of Android emulator should bring more
stability.

Pick-to: 6.9 6.8 6.5
Fixes: QTQAINFRA-6805
Change-Id: Id67d3ec888b486e6aae862588928528788583aae
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2024-12-11 06:10:08 +00:00
Assam Boudjelthia
e1015f2718 Android: replace Android 9 revision 9 to revision 8 as it's more stable
The current revision 9 seems to have issues that are not reproducible
on other environments and even not with other ABIs like x64 or arm64.

Pick-to: 6.8
Task-number: QTBUG-97650
Change-Id: I6f4827f170ea11b8aae9cc774c075fa043e4df5a
Reviewed-by: Simo Fält <simo.falt@qt.io>
2024-10-04 16:15:03 +00:00
Assam Boudjelthia
536555cde6 Android: upadate the sha for Gradle script for provisioning
Use the sha from last update of Gradle and update AGP version
to match qtbase.

Pick-to: 6.8
Change-Id: Ia235dacfc3206246c4c4330fb185ce1319d45909
Reviewed-by: Simo Fält <simo.falt@qt.io>
2024-10-04 19:15:00 +03:00
Konsta Alajärvi
b5b95a2fa1 Coin: Android: Add Android 15 in CI
Add Android 15 to CI with InsignificantTests flag.

Task-number: QTBUG-127802
Pick-to: 6.8 6.5
Change-Id: I16e787e1633edd15efd2191f7e23ac275d4f90f7
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2024-10-03 10:39:16 +00:00
Olli Vuolteenaho
eb75583856 Update QtAA maximum supported SDK level
Like regular Android we test QtAA in CI with the maximum and minimum
supported SDK levels - currently 10 and 13. This commit bumps the
maximum level to 14 starting from QtAA 6.8.

Pick-to: 6.8
Task-number: QAA-2410
Change-Id: I8ef645b2c7bb1ee2b1fd20980bad0f593d308df8
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2024-06-18 17:35:24 +00:00
Assam Boudjelthia
695d249f21 Coin: write multiple lines from bash script with different syntax
The current way of using "cat <<EOB" works but then confuses
Gerrit's online editor and syntax highlighting after it becomes
wrong. using echo does the same and avoid this syntax highliting
confusion.

Pick-to: 6.8
Change-Id: Id97bf23f51dd9321cf7e02f263b957ed7655bfb5
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2024-06-08 16:03:10 +00:00
Assam Boudjelthia
2e9af73a58 COIN:Android: update sha and versions for Gradle caching
Update AGP, minSDK and androidx.core versions and qtbase
sha. This is needed after Gradle, AGP and minimum Android
version bumps done in:
* f22e9795d9a32fc4e9f4d6f2a70c2f831028342b (Gradle and AGP)
* 841bbbe8ec5eb9c822af4359278f73ae9a6599bb (Android 9 bump)

Pick-to: 6.8
Change-Id: I88d598ab1041847a995c37fc665467a2e9d12ab5
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2024-06-08 16:03:04 +00:00
Assam Boudjelthia
6b729467ca Android: bump minimum CI test emulator to Android 9 api 28
Following Android minimum version criteria, Android 9 would be the
version matching 90% market share range.

Fixes: QTBUG-125022
Task-number: QTBUG-124890
Change-Id: I6e103532f7c558f0111c9f1582a1b80cd61c47e4
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
2024-05-17 21:26:02 +03:00
Assam Boudjelthia
e47468b7d9 Android:Coin: fix shellcheck issues in android_linux.sh
use '=' and '?' instead of '\=' and '\?' and wrap the curl URL
in quotes.

Amends 39517ef0d0.

Pick-to: 6.7
Task-number: QTQAINFRA-6166
Change-Id: I6e6333cdb94043d5476cac5bc631ea1ca16bab1f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2024-04-24 07:51:52 +00:00
Assam Boudjelthia
2d7f6760dd Coin:Android: bump minimum CI test emulator to Android 8 api 26
Qt 6.7 has the minimum supported Android version as 8, this applies
that to the CI as well.

Pick-to: 6.7
Task-number: QTBUG-111919
Change-Id: Id4c9eda29f1b61bf739eae3624b07f44a893cfae
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2024-04-23 09:14:05 +00:00
Assam Boudjelthia
3d69ad8d8a Android: remove unused Android 13 (api 33) system image download
Android 13 system image was still being downloaded and an emulator
created for it while it's not being used in CI, so it's just adds
unnecessary load to provisioning.

Pick-to: 6.7
Change-Id: Ie33c82fd578dcfe68a77426c8e5c0cf047938833
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2024-04-23 09:14:02 +00:00
Assam Boudjelthia
39517ef0d0 Android:Coin: do gradle build in provisioning to cache downloadables
If Gradle is not present in the system, it's downloaded from the URL
from the Gradle wrapper. Also, the same for AGP when an Android
project build is done. Currently, that's done on every integration,
and that can be unreliable due to networking flakiness. With this
patch, a Gradle build is done once during provisioning where the
downloads of Gradle and AGP dependencies are downloaded.

Fixes: QTQAINFRA-6166
Fixes: QTQAINFRA-4726
Fixes: QTBUG-117203
Fixes: QTBUG-114699
Change-Id: Ic9fd8aeea3379ca1d45ffeb4523a52e2846fcabb
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2024-04-14 13:28:59 +00:00
Assam Boudjelthia
a9f16c0abd Coin:Android: update emulator version to 34.1.19
Update to latest (as of now) Android emulator version 34.1.19, which
might solve Vulkan crashes on some CI tests.

Pick-to: 6.7 6.6 6.5
Task-number: QTQAINFRA-5971
Change-Id: Ic81158f44ac5c922bfdbe6f5c04900234e063615
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2024-04-05 05:47:09 +00:00
Assam Boudjelthia
710f03ffcc Android: use Android emulator 32.1.15 to not break rhi tests
Currently CI doesn't cache specific Android Emulator version,
so after an update was availabe 33.1.23 is broke RHI tests on
Android 13 emulator. The last known emulator version to to work
was 32.1.15, so as a workaround we install this specific version.

Fixes: QTBUG-119884
Pick-to: 6.7
Change-Id: Iec56207b6142d97a9dfabc0fb07a920c868e58b1
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 481825822b)
Reviewed-by: Zoltan Gera <zoltan.gera@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2024-01-31 19:07:06 +00:00
Elias Toivola
782e1700cf Update Android NDK to version r26b
Revision 26.1.10909125. Also prebuilt OpenSSL 3.0.7 with it.

Task-number: QTQAINFRA-5771
Pick-to: 6.7
Change-Id: I0dbe1f2d38f277bcb805f5b7ac1f30e25aabd1f8
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
2023-12-22 02:46:33 +00:00
Amir Masoud Abdol
a5a6393145 Provisioning: Install OpenSSL via Vcpkg on Linux
- Add a custom triplets for building dynamic android libraries
- Set `ANDROID_NDK_HOME` environment variable, as it is needed when
  vcpkg builds for Android.
- Install `perl-IPC-Cmd` when necessary, requirement for OpenSSL.
- Install openSSL for x64-linux-qt, x86-android-qt, and
  x86_64-android-qt. The latter android triplet has been renamed from
  vcpkg's official `x64-android.cmake` triplet to further clarify the
  android abi.
- Adjusted version.txt to account for the existence of two OpenSSL. The
  system OpenSSL now shows up as `System's OpenSSL` in `version.txt`.

Task-number: QTBUG-115715
Change-Id: I6cf9b808d26bbea97ebeeadac58cef5ede25ee50
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-12-18 06:32:32 +01:00
Elias Toivola
7bc6a1c869 Android: Update Android 14 system image for emulator
Use the latest Android 14 image in CI Android emulator. Build ID:
UE1A.230829.036. This should reduce tests crashing with Android.

Task-number: QTQAINFRA-5971
Pick-to: 6.7
Change-Id: Id9c221118163feef722e402d9e412381809b6b72
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-12-15 12:35:23 +00:00
Petri Virkkunen
eb100b6e3b Add AAOS10 image for Android Automotive emulator as minimum supported SDK
Android Automotive should follow the lead for Q4A and regularly test
changes with both the minimum and then maximum supported SDK levels.
These are Android 10 and 13, of which 13 is already active on the CI.
This commit adds a Configuration for Android 10 and support for
creating an avd for that image.

Task-number: QAA-2073
Change-Id: I6d22c68f10a5da4b46664c67cf1369cbc7f5a537
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-11-01 16:54:30 +02:00
Petri Virkkunen
3f2386f2c4 Android: Use Android 14 Beta image instead of downloaded one
After Oct 4th Google Android 14 release, few cases started to fail.
Cases did not fail earlier. Earlier system images were downloaded.
This change introduces system image storage to CI-files.

Task-number: QTBUG-117994
Change-Id: I143691f6d87f8c9b40b1f5744164cb0d22c219c3
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-10-27 21:55:14 +03:00
Petri Virkkunen
879092ecc1 Update Android Automotive emulator image to AAOS13
Task-number: QAA-2036
Change-Id: I6f27bf9edbd5c7b4f0a3124d888e3b0ac2f48bfa
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2023-09-27 08:58:24 +03:00
Elias Toivola
b105bbaab1 Provisioning: Bump sdkApiLevel and sdkBuildToolsVersion to 34.0.0
Task-number: QTQAINFRA-5691
Change-Id: I4c0f92a53165f316da4b69161f0ec7cb6f889167
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-09-14 05:04:47 +00:00
Tony Sarajärvi
620666bce4 Fix shellcheck complaints about provisioning scripts
Also adds executable attributes to shell scripts that were missing it.

Change-Id: Id52ef495147fdbfb5cb1a1f711fac530e0e85f3b
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2023-09-13 06:44:02 +00:00
Rami Potinkara
b808969b95 Coin/Android: Add Android 14 to CI
Add Android 14 to CI and keep 13 as maximum supported version, to allow
significant testing for both Android 13 and 14.

Android 13 is not yet removed, because Android 14 is still in beta
phase, so the plan is to fully replace Android 13 with Android 14 once
it's publicly released, and for now test Android 14, to avoid any
potential fails that might come before the final release.

[*] Android 14 is expected to be released late August 2023.

Task-number: QTQAINFRA-5609
Task-number: QTQAINFRA-5557
Change-Id: Ied5c560aa7d60f00948482fb1d7091b3139c6f0c
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-09-05 16:29:06 +00:00
Assam Boudjelthia
8d199fd701 COIN/ANDROID: Move android_emulator_launcher.sh to qt5.git
The android emulator launcher script is mainly used in CI and thus
makes sense to be moved there. This also makes it easier to make changes
without having to wait for submodule updates.

The env var ANDROID_EMULATOR_RUNNER points to the path of the runner
script, and can be used by qtbase.

qt5.git part of the change.

Task-number: QTQAINFRA-5596
Change-Id: If253e0a5f14d67526995561b1859312e61efdfff
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-07-25 15:52:58 +03:00
Lucie Gérard
eecfb19548 Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.

Pick-to: 6.5 6.6
Task-number: QTBUG-67283
Task-number: QTBUG-108364
Change-Id: If26e4d35c780db4a7982bb84872b251dad24716e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2023-06-12 12:10:41 +00:00
Petri Virkkunen
3115ca5d17 Update Android Automotive emulator image in CI to use AAOS 12
Android 12 is the desired platform for most users, need to run our tests
on it instead of A11.

Task-number: QAA-1739
Change-Id: Iadfdfcbc97b062baa1c4ef6eb46e9e1af6e3478a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
2023-06-12 15:10:37 +03:00
Tony Sarajärvi
58ddf7133c Correct the domain of ci-files01-hki
It's hasn't been .intra.qt.io for quite some time, it
has worked through an alias we have on the DNS server.

Change-Id: I0bc17668dacfea64c276bb553e75e4be16e97659
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2023-06-12 12:10:26 +00:00
Rami Potinkara
ef12163e25 Android: Android OS 13 API 33 to CI as maximum version
Android 13 replaces Android 12 as max version in CI.
Android 6 kept as minimum version of Android in CI.

Task-number: QTQAINFRA-5392
Task-number: QTQAINFRA-5431
Change-Id: If85c6f63d52055e2ba95f92c154b20a6b809c7dc
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-05-17 08:24:02 +03:00
Assam Boudjelthia
454a7f5da2 Coin: fix typo Automovie to Automotive
Change-Id: I6b650c1cd6f2d7b514ce6246da2abacfc7e7303d
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-01-20 11:45:06 +02:00
Assam Boudjelthia
8abebe23ef Coin: bump Android platform sdk and build tools version to 33
Use latest platform and build tools to be able to build for Android 13.

Pick-to: 6.5
Change-Id: I00bd9948f528d398d471e91de1d22954d786be29
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-01-20 11:45:02 +02:00
Assam Boudjelthia
b7ea626a07 Add Android 12 emulator for CI testing
Add Android 12 emulator to make sure tests are verified
on a recent Android release. Android 12 has only x64 emulator
version from sdkmanager and x86_64 is better in any case.

This patch only adds the emulator, but doesn't enable its use,
that is done under another patch.

Task-number: QTQAINFRA-4748
Task-number: QTQAINFRA-4733
Change-Id: Ic1569fb1afa5b2d02e6eadea1d9a8eac0a378d98
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-11-09 06:08:17 +00:00
Matti Paaso
936ede45de Update Android NDK to version r25b
Update NDK to version r25b and prebuilt openssl 1.1.1m built with
it. Change log: https://github.com/android/ndk/wiki/Changelog-r25

Task-number: QTBUG-105397
Change-Id: I501f43066e7ba8af8a57efdbee6c4a625bb80852
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-10-17 19:47:10 +03:00
Heikki Halmet
8a72b1de99 Support multiple Android NDK versions
We need to verify latest Android NDK version in all
Qt6 branches and we need to retain the NDK version we
had when the specific branch was released at the first time.

Verification of the latest NDK will be done during integrations
in 'dev' branch and with older brances it will be done using
nightly build targets

Task-number: QTQAINFRA-4990
Change-Id: I2a96e419d403820f55f4244230c28ad09dc9095b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-09-20 10:30:05 +03:00
Heikki Halmet
789c276431 Update NDK to r23b
This also fixes Android OpenSSL installation

NDK update will be added only to dev and 6.3 branches

Task-number: QTQAINFRA-4837
Change-Id: I1233217e71f345d30f3dec83d7477d3c6e3b6c2d
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-04-12 11:45:04 +00:00
Heikki Halmet
12a87cba0a Provisioning: Install Android 11 automotive emulator
This is needed after moving from internal tqtc-qt5 branches to qt5.
Android 11 image was built internally.

Pick-to: 6.3 6.2
Task-number: QTQAINFRA-4343
Change-Id: Ie0c4c5853079303ef9d4537f3b7b06ab62f14e3b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-04-08 08:15:19 +00:00
Assam Boudjelthia
a4cc949b8d Rename the Android emulator to be more descriptive
Because we want to add Android 12 emulator for testing, it's important
to have a more descriptive emulator name. For this one, it includes
api_23 part.

Task-number: QTBUG-88846
Pick-to: 6.3 6.2
Change-Id: I5b8ca276b1bad41bb61272585a4fc4f064e65d71
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-02-23 19:22:22 +02:00
Kai Köhne
becb423e80 Replace LGPL2.1 only header with LGPL3 one
This is in line with e.g. qtbase. Also remove outdated/unreferenced
license files.

Pick-to: 6.3
Change-Id: I5d3370ab453610f9c8165ff9e57db7ad4a785370
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-12-19 19:47:15 +00:00
Assam Boudjelthia
286a294daf Coin: bump Android platform sdk and build tools version to 31
Use latest platform and build tools.

Pick-to: 6.2
Change-Id: I8ddfe79706470918d956a97876a5d140a57ec87b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2021-10-29 15:08:36 +00:00
Assam Boudjelthia
d59825d250 Coin:Android: set ANDROID_SDK_ROOT explicitly
... and remove ANDROID_{SDK,NDK}_HOME as they are
deprecated and might not work even.

Pick-to: 6.2
Task-number: QTBUG-97002
Change-Id: Ie6fe93eb91fad0153aee795b73a43e84e37c8127
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-10-22 09:14:29 +02:00