Commit Graph

5225 Commits

Author SHA1 Message Date
Artem Dyomin
0f8eccdfc5 Update ffmpeg version to 5.1 for desktop platforms
Some issues have been fixed in ffmpeg 5.1, e.g, with videotoolbox.
So the update at least fixes our playback
of some video formats on macos, e.g. provided in the related bug.

After the update I tested the basic functionality on windows,
linux, macOS, and run CI tests, which are OK.

Task-number: QTBUG-98102
Pick-to: 6.5 6.4
Change-Id: I72f45780e1c3983d6a1941db2b833b78784b90de
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2023-01-16 22:15:16 +01:00
Heikki Halmet
c3d5a51de4 Fix Id for Windows 11 arm64 target
Pick-to: 6.5 6.4
Change-Id: I68f751b33a0ea23f674c7ce4e63da9de830305cf
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-01-16 18:58:09 +00:00
Toni Saario
bcf5c6680c Fix ubuntu 20 id in precheck yaml
Amends 92ae8eb4ca

Pick-to: 6.4 6.5
Change-Id: I098a45856ab3197d180c58dd595a790f1b7a1fc0
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-01-16 06:11:16 +00:00
Qt Submodule Update Bot
1e0008349a Update submodules on 'dev in qt/qt5'
Change-Id: I38f2f8379e0bcc801ffa75e5988a909994883af2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-14 04:49:34 +00:00
Heikki Halmet
e266a9e604 Provisioning: Add Docker for macOS
Needed by RTA tests

Pick-to: 6.5 6.4
Task-number: QTQAINFRA-5171
Change-Id: I26ac10421ba32d68ffdef523fd97f710cd6bcaab
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-01-12 12:28:47 +00:00
Heikki Halmet
a915ead6ac Fix tqtc-android-automotive Id
Current id won't work when including cmake_platforms_target_android.yaml

Pick-to: 6.5 6.4
Change-Id: I6dc488e5bf683608f567dcc2871e3c1861990e32
Reviewed-by: Toni Saario <toni.saario@qt.io>
2023-01-12 08:06:23 +00:00
Samuel Mira
f412e6f1d1 Provision FFmpeg library for Android
Pick-to: 6.4 6.5
Fixes: QTBUG-100474
Change-Id: I5cc6f645bd020628bc6a77d4a5d42575f4fcf979
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2023-01-11 09:48:20 +02:00
Heikki Halmet
68a7947e42 Start using OpenSSL 3.0.7 in CI
Task-number: QTQAINFRA-4889
Change-Id: I3e335395762710d520ca93a5996d1b21d202ed4e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Vladimir Minenko <vladimir.minenko@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-01-10 05:50:29 +00:00
Heikki Halmet
92ae8eb4ca Add ID for all targets
All targets should have ID. This way it's easier to refer to needed
target

Pick-to: 6.4 6.5 6.3 6.2
Change-Id: I0af8399c3a4c436ab1e778ab4396c65ccd3a373b
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-01-10 05:50:26 +00:00
Tatiana Borisova
e49d963fe5 Suppress warnings from Integrity builds
We are seeing ~200 000 compiler warnings coming from Integrity compiler
not seen on other compilers. Suppress these as a hotfix reduce the
load on CI.

Change-Id: Ibd0a47b1c5f2b6ce2612fc1c466096a032cc9a65
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-01-08 14:08:00 +01:00
Simo Fält
ab2ec09a76 Provisioning: Update default python3 version in win
Change amends 95e9f8da9a after new
version of win templates were introduced.

Pick-to: 6.4 6.5
Change-Id: Idd370025201c66e3da5a3bde71573ad8461c4164
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2023-01-06 08:51:54 +02:00
Qt Submodule Update Bot
9cb3b0edbe Update submodules on 'dev in qt/qt5'
Change-Id: I2d92d68168645992efbaaca63202e9c71e703b17
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-06 02:46:30 +00:00
Qt Submodule Update Bot
b29b22c372 Update submodules on 'dev in qt/qt5'
Change-Id: I61ffac8d02bd97f873ba31eac41660bb9d1d7640
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-03 14:50:20 +00:00
Heikki Halmet
1fd2a26492 Change to use sha256 signed opengl32 mesa dll files
Pick-to: 6.5 6.4 6.2 5.15
Task-number: QTBUG-108774
Change-Id: I7d2716aa23215b783365c293c968aeeef6626126
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-01-02 11:52:05 +00:00
Simo Fält
95e9f8da9a Provisioning: Update default python3 version
Removing python3.6 and replacing it with more recent versions.

Pick-to: 6.4 6.5
Change-Id: If8cd4c369e4fc9ff8dc7d53865b80b588f278091
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2022-12-29 07:05:22 +00:00
Simo Fält
5f15a8113e Provisioning: Install missing perl-FindBin package to rhel9
FindBin.pm was moved from perl-intepreter package to separate package.

Change-Id: I6e889555f573a7dc9ae3d736d9b1c014eb6da656
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2022-12-28 13:35:44 +02:00
Morten Sørvig
1d77e42542 wasm: update emscripten to 3.1.25
Qt 6.5 will require emscripten 3.1.25

Change-Id: I23e0d0b6951a4d69aa431710114ec2c06f7afcc3
Reviewed-by: Aleksandr Reviakin <aleksandr.reviakin@qt.io>
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
2022-12-28 10:22:38 +00:00
Heikki Halmet
5880c423c8 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>
2022-12-23 17:45:40 +00:00
Qt Submodule Update Bot
0dfc13cfaf Update submodules on 'dev in qt/qt5'
Change-Id: I68b657474f3b4dce9fd488fa760b6b7c9c30d798
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-22 04:55:22 +00:00
David Skoland
d9fd5bfa01 Cleanup webassembly-linux-thread-asyncify config
Remove explicit references to sccache and use more basic
configure options.

Change-Id: If046b003fff1bd6c1bb7b120fba11ca067b0eb86
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2022-12-20 11:00:17 +01:00
Heikki Halmet
eb0dd02a4a Provisioning: Upgrade Xcode version to 14.2 for macOS 12 & 13
Change also upgrades command line tools

Pick-to: 6.4 6.2 5.15
Change-Id: I6cdceba07dcecf5b0be394dc147c16e084800763
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-12-20 08:35:15 +00:00
Jani Heikkinen
172ca715e6 Qt6: Remove 'TP' status from qtquick3dphysics from Qt 6.5 ->
qtquick3dphysics will be officially supported module form Qt 6.5 ->
so change the status in .gitmodules from preview to addon

Task-number: QTBUG-107387
Pick-to: 6.5
Change-Id: Ic117f4cf3e99e4a2f59bd84aa14979419a3533b9
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-12-16 22:53:49 +00:00
Qt Submodule Update Bot
0142069b04 Update submodules on 'dev in qt/qt5'
Change-Id: If5f8c9e4bb6b59cb135dbf46b4fcb55f5622b09a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-16 22:53:48 +00:00
Tor Arne Vestbø
e641b4d62b coin: Remove macOS 10.14 provisioning scripts
They are no longer used by any configuration for 6.5

Change-Id: I14c41f0b66b52670dfe86f5bb975bc3665bb5a98
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-12-13 10:26:13 +01:00
Konrad Kujawa
63d72293b7 Add provisioning for gRPC
Add provisioning scripts to install gRPC.
gRPC is requirement to build QtGrpc

Task-number: QTBUG-105492
Change-Id: I1a6d008a1d2c1616000909aacdb721401f706168
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-12-07 07:57:21 +01:00
Tor Arne Vestbø
21be8b0c05 Run tests with FFMpeg backend on macOS without depending on CMake variable
The mechanism employed where a CI test configuration would add
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' to its
environment variables to trigger QT_MEDIA_BACKEND=ffmpeg, was
needlessly indirect and based on conditions that didn't make
sense.

The logic now lives in the qtmultimedia repository.

Change-Id: I46b8fc1df45676b060157bfd670e9971980f0369
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2022-12-06 15:17:40 +01: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
Alexandru Croitor
4588f198cd CMake: Run iOS build tests in qtdeclarative
Pick-to: 6.4
Task-number: QTBUG-96056
Change-Id: I7c3c3d9d3802ceb71dbca6eb85b7f544b7bb05f2
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-12-05 23:05:19 +01:00
Qt Submodule Update Bot
3641e6c8a0 Update submodules on 'dev in qt/qt5'
Change-Id: Ida1538ae0bc02b83d3227fc32fe1afa275613eb8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-02 20:00:43 +00:00
Alexey Edelev
c32a843766 Bump macOS minimum deployment target to 11 for 3rd party dependencies
3rd party dependencies should be built using the same minimum deployment
target as Qt uses for compatibility.

Change-Id: I2edb2c19b90757898f6dcb76ad60602ae2249ebc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-11-29 11:32:13 +01:00
Tor Arne Vestbø
6652583be2 Remove macOS 10.15 test configurations
macOS Catalina (10.15) has reached its end-of-life, and is no longer
supported with bug fixes or security updates by Apple.

Change-Id: Id8c222ee28f48b551c3522bfd353cf71be74d62e
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-11-28 18:09:20 +01:00
Tor Arne Vestbø
7143bb3079 Make iOS tests significant again
We now have CMake 3.24 in CI, so we can re-enable the iOS tests.

Fixes: QTQAINFRA-5224
Change-Id: I742a9182299fb8ac6c52187a06a223a837d3968e
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-11-28 18:09:20 +01:00
Oliver Wolff
37c0cf82ae Provisioning: MSVC 2019 update: Add Vswhere helper function
Pick-to: 6.4 6.2
Change-Id: Idd6bf24450d9447c38c39c64abff5b55d71c12b9
Reviewed-by: Miguel Costa <miguel.costa@qt.io>
2022-11-28 09:00:42 +01:00
Heikki Halmet
fb34091c45 Pin mesa-libEGL and mesa-libGL versions for RHEL 9
Version 22.1.5-2.el9 cause crash with Xorg during bootup. Older version
seems to work correctly

Task-number: QTQAINFRA-5302
Change-Id: I470ce3d3a9941b17c6e6c31778bc1ee91659e5a5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-11-27 13:48:31 +00:00
Heikki Halmet
6567b8a7c4 Add qtattributionsscanner binaries built on Ubuntu 22.04
Libicu66 installation can be removed now

Task-number: QTQAINFRA-4926
Change-Id: I3c8b67e9445c1268aeaf16bf1539cabb50b2cf86
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2022-11-26 18:39:59 +00:00
Alexandru Croitor
6943f28b17 CMake: Update provisioned CMake to version 3.24.2
Needed to fix iOS Xcode generator builds when using Xcode 14.
Otherwise compiler identification fails due to a code-signing error.
We hit it in our iOS MinimalStaticTests configuration.

 error: Cannot code sign because the target does not have an
        Info.plist file and one is not being generated
        automatically.
         (in target 'CompilerIdCXX' from project
         'CompilerIdCXX')

See https://gitlab.kitware.com/cmake/cmake/-/issues/23719

Amends eee152ca70

Fixes: QTQAINFRA-5044
Change-Id: Idabd78e6e28816a8fc4dd7e627de82f2c622c54e
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-11-26 18:19:17 +01:00
Alexey Edelev
661636f3e8 Add the missing protobuf provisioning script for MacOS 11 x86_64
Change-Id: I5c607a05b2f040e90cc0c4a2220d8565881c4983
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
2022-11-25 09:50:50 +01:00
Alexey Edelev
76a44df841 Adjust CMAKE_OSX_DEPLOYMENT_TARGET for protobuf package across MacOS platforms
Change-Id: Ie9f1b2273c437016fd51173e330a5df4cc924ebc
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-11-25 09:50:46 +01:00
Allan Sandfeld Jensen
bb89b5ca77 Add optional dependencies for QtWebEngine
To better use system libraries and reduce the size of webengine libs

Change-Id: I626327e123ee93bc25f5b40d5adbdffa6dfb772d
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-11-24 22:27:26 +01:00
Heikki Halmet
fae885e9c1 Provisioning: Make bootstrap autostart run without terminal
Terminal in UI might cause issues with Autotest
This patch makes bootstrap-agent run in a background shell wrapper.

The wrapper waits 20secs for the VM's network to come up and exits
with an error if it doesn't.
After that it waits for 20secs for the context image to be mounted.
If no context image is mounted after that, it waits for one minute
and makes one mounting attempt, before launching bootstrap-agent with
or without context.

Pick-to: 6.4 6.2
Task-number: COIN-966
Change-Id: I9a3e490325d1fd7c0583b6d5db5eb2023e042571
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-11-24 21:18:53 +00:00
Jani Heikkinen
0a49fc9d7d Add qtquickeffectmaker submodule
Task-number: QTBUG-108164
Change-Id: Ie3887bc420a0451e40a64afc14273ed40790c99f
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
2022-11-24 18:58:44 +02:00
Artem Dyomin
817a6d07f8 Add diffutils to msys2
cmp command is used by ffmpeg ./configure

Pick-to: 6.4
Change-Id: If80664d6c3318b7605c69d50e7606a1ec10840ea
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2022-11-24 09:54:11 +01:00
Artem Dyomin
5ef8294f3f Enable llvm-mingw ffmpeg windows build
- Added build of ffmpeg for llvm-mingw
- Improved build errors handling
- Refactoring: decompose script into a few functions

Build example:
https://testresults.qt.io/coin/integration/qt/qt5/tasks/web_qt_qt5_1668780311363
See tests for LLVM-x64, they passed

Pick-to: 6.4
Change-Id: I59fe28ba6eb8e65ef5c4c3d08343ff72f349bd21
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-11-24 09:53:57 +01:00
Jani Heikkinen
d4cc1708ba Change qtlocation from 'ignore' to preview
Task-number: QTBUG-108726
Change-Id: I13ff5af38c846358a9091ce4e0ca3100b4054b39
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-11-24 09:14:18 +02:00
Jani Heikkinen
27dd0c29fe Qt6: Build wasm target binaries only once
non-threaded Wasm build will be built only in windows.

threaded wasm build will be done in macOS.

thread-asyncify wasm build will be done in linux.

Change-Id: Ibea96aca1ec4ce15c632ba2f4223d898f6ebffaa
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-11-24 09:14:04 +02:00
Rami Potinkara
0b88c1e2f0 Make qtwebview significant for Android 12 emulator in CI
Needs blacklisting of tst_QQuickWebView::settings_JS

Task-number: QTBUG-108752
Task-number: QTQAINFRA-4733
Change-Id: Icf3ed9f223195d602b1c28c42afb26e53157fec8
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-11-24 05:09:39 +00:00
Samuli Piippo
2b8f50a2d1 Add universal libusb binaries to macOS
Brew does not support universal binaries, but provides separate
amd64 and arm64 packages. We need to add arm64 binaries for libus,
so that the universal builds work also for QDB.

Use brew to fetch both architecture packages and use them to
create universal libs for the libusb.

Remove from macOS 10.14, add to macOS 12 arm.

Task-number: QTBUG-107457
Pick-to: 6.2
Change-Id: If19fd6d303a20d8742c88ea11d5b30cc55f45d6b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-11-24 05:38:38 +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
Konrad Kujawa
2034c71953 Update Protobuf to 21.9 version
Change-Id: Ia25251b87ea993f47046b9cfff3d0b024b57277f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-11-23 09:14:04 +01:00