Commit Graph

20 Commits

Author SHA1 Message Date
Alexey Edelev
593bbf54db Disable native_grpc feature for "Packaging" platforms
Native gRPC channels rely on the reference gRPC implementation that
doesn't guarantee the ABI compatibility between different versions. We
shouldn't link libQt6GRPC to any 3rdparty libraries that are not
delivered as part of Qt when make packaging builds in CI.

Task-number: QTBUG-115055
Task-number: QTBUG-110107
Change-Id: Ie099b0af833d87308179d3b4eecc47738078010c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit b028d7499f)
2023-07-27 09:46:06 +02:00
Heikki Halmet
81f3ea0f5f Upgrade MSVC 2022 and 2019 for Windows 10 22H2
Change upgrades also build tools for both visual studios

MSVC 2022: 17.6.4
MSVC 2019: 16.11.27

Task-number: COIN-1059
Change-Id: Id212d396a58827d5794158a4b314ec65ad5a3f47
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
(cherry picked from commit 6341108c6f)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2023-07-12 09:05:10 +02:00
Tor Arne Vestbø
55edbbaea0 Remove conan profiles
The conan experiment has ended, and the files are only bitrotting
nowadays.

Change-Id: Iefdc6fa1a48bb4062b15cf035f372a2d44bddda9
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 8214de5e0e)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2023-06-24 12:09:21 +00:00
Rami Potinkara
b9af6ca0a2 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>
(cherry picked from commit ef12163e25)
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-05-19 07:10:39 +00:00
Samuel Mira
e4447d0b55 Fix FFmpeg provisioning for Android armv7a
Altered install-ffmpeg.ps1 script to build android armv7a archicture

Task-number: QTQAINFRA-5476
Change-Id: I5179174c8676a3016df2922c00030e9d45a9009c
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 2751db4d29)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-05-17 22:55:21 +00:00
Samuel Mira
e3b200d728 Fix FFmpeg provisioning for Android in arm64, x86 and x86_64
Added install-ffmpeg-android script for the android cross-compile
Removed android stuff from install-ffmpeg
Changed the yaml variables to include the target arch
Added the arm64 target arch

Task-number: QTQAINFRA-5476
Change-Id: Id9609ed0427f2fc42f7f27e7787a81ad145f59be
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 99afe7199e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-05-03 11:22:10 +00:00
Samuel Mira
fe2271bba3 Enable ffmpeg for Android
After ffmpeg was removed on Android targets following QTBUG-110172,
this patch enables it after fixing the failing test.

Task-number: QTBUG-110453
Change-Id: I5598a9b72d06af6664455e933129a08192afac15
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit b9c2512748)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-12 16:52:42 +00:00
Heikki Halmet
7051182f20 Remove ffmpeg for Android
This is causing autotest failures in multimedia.

Pick-to: dev 6.4
Task-number: QTBUG-110453
Change-Id: I1eacd8eec72d4f17f7f18df9f70c07bbecc0d48b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-01-23 09:37:53 +00:00
Heikki Halmet
7ac39979ce Revert back to use RHEL 8.4 with Android targets
RHEL-9 is causing problems in QtApplicationmanager when using
RHEL-8.4 as a host build: It can't load libcrypto in Android
build phase

Pick-to: dev 6.4
Task-number: QTBUG-110172
Change-Id: I6d5ef4684fb11e384eb54f9a37bd30e4ef8d145b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-01-23 09:37:35 +00:00
Heikki Halmet
1759420acc Change RHEL 9.0 to RHEL 8.4 for packaging targets
RHEL 9 is causing glibc issue with older linux distros.
Let's revert back to use the older RHEL version.
For Android targets we can still use RHEL 9

Pick-to: dev
Task-number: QTBUG-110172
Change-Id: I6d61a550fceaab4946e27bd8806263ccfa38a6e6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-01-17 10:25:49 +00:00
Heikki Halmet
7630a1cc57 Add ID for all targets
All targets should have ID. This way it's easier to refer to needed
target

Change-Id: I0af8399c3a4c436ab1e778ab4396c65ccd3a373b
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 92ae8eb4ca)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2023-01-16 18:57:31 +00:00
Samuel Mira
a70a2788f3 Provision FFmpeg library for Android
Fixes: QTBUG-100474
Change-Id: I5cc6f645bd020628bc6a77d4a5d42575f4fcf979
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit f412e6f1d1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-12 08:33:42 +00:00
Heikki Halmet
d2770134a5 Add RHEL 9 to CI
This will replace RHEL 8

Task-number: QTQAINFRA-5111
Change-Id: Ib65e9b7a2afa85418d5113261bc83ba915b2bce0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit 5880c423c8)
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-01-03 10:14:17 +00:00
Fabian Kosmale
5091ac1c2c Revert "Android: Add WarningsAreErrors to Android targets"
This reverts commit d522c16201.

Reason for revert: This currently breaks CI, as declarative
and qtbase are in fact not warning free.

Change-Id: I52ecd7e845ea5ed3b47a6e7dd6426c6ac57b1095
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-12-06 11:09:28 +00:00
Assam Boudjelthia
d522c16201 Android: Add WarningsAreErrors to Android targets
Many times there were warnings of comparison of signs which can go
unnoticed for various Android ABIs, so make warnings as errors
to make sure to catch such issues on the fly.

Change-Id: Idbc65bb3533188705ff7f7b9aaaf9de093817e4b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-12-06 01:13:36 +02:00
Alexey Edelev
ab0b005a57 Add the missing additional CMake host prefix to Android and WASM platforms
Add QT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH for Android and WASM
platforms to allow CMake find the host qtprotobufgen. The prefix points
to a host Protobuf package which qtprotobufgen depends on.

Change-Id: I2250614dceafb4b93a8a13ddb549f4ecc459436b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-11-23 20:07:51 +01:00
Heikki Halmet
e9b3497c8e Add Windows 10 22H2 to CI
Pre-installed to tier 1:
          MSVC 2022 17.3.6 plus build tools
	  MSVC 2019 16.11.20 plus build tools
          MSVC 2015 update 3 14.0.25420.1

Task-number: QTQAINFRA-5262
Change-Id: Ibcc2950dd7edef0d6aa92cef7e602a69da8498d9
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-11-18 08:34:53 +00:00
Alexey Edelev
8f6cdc23be Add Android Multi-ABI CI preset
Add the minimal test preset for Multi-ABI Qt for Android.

Change-Id: Ic534daa5cea823b08b718f43ece637f9f9b375d9
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-11-15 14:08:39 +02:00
Heikki Halmet
d45c78212a Use updated macOS 12 tier1 image with Android
Use templates which have Accessibility enabled for Squish.

Pick-to: 6.4
Task-number: QTQAINFRA-3559
Change-Id: If3c1a68a475149efdeb3bfd19efd6edaea411167
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-10-07 12:21:18 +03:00
Jani Heikkinen
8899244b8c Build android target binaries only once
- android armv7 is build only in windows
- android arm64 is build only in mac
- android x86 and android x86_64 are build only in linux

Task-number: QTBUG-101357
Pick-to: 6.4
Change-Id: Ibfbd2e3c6d5d3a7a52dde3b35ca6c23eddf4b2f1
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-09-22 13:42:42 +03:00