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)
Current id won't work when including cmake_platforms_target_android.yaml
Change-Id: I6dc488e5bf683608f567dcc2871e3c1861990e32
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit a915ead6ac)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
There's a bug or feature in Coin which makes Coin to include all
dependencies which are in this case under cmake_platforms and yaml-files
which are included to cmake_platforms. Because of that we can't include
macos.yaml separately.
Change-Id: Ie4a019e07f8b30f6ef18405446947d96a592d4a2
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
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: Qt CI Bot <qt_ci_bot@qt-project.org>
This change will upgrade docker-compose version to v2.15.1
Also 'containerd', 'docker-ce' and 'docker-ce-cli' versions will be
upgraded to support newer Ubuntu version (20.04)
Task-number: QTQAINFRA-5396
Change-Id: I282a1cbc5870db765409985983d29f57936d1798
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
(cherry picked from commit 739cc29b77)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Using vswhere we can make sure if the MSVC 2019 update finished with the
right version. For further safety we check, if the installation is
complete and launchable.
Change-Id: I90e84bf4922647b4ff30ba93a207b9d5e1a96120
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit bc4797a7e8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
If MSVC 2022 is installed in CI machines, vswhere -latest without any
additional version information will return the latest version of 2022.
By limiting the version range (>=16, <17) we make sure that only the
latest version of MSVC 2019 is returned.
Change-Id: I8f92099f030660c1914ffb728efc9a55eadf4808
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 37f4d821b8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This is causing autotest failures in multimedia.
Task-number: QTBUG-110453
Change-Id: I1eacd8eec72d4f17f7f18df9f70c07bbecc0d48b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 7051182f20)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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
Change-Id: I72f45780e1c3983d6a1941db2b833b78784b90de
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 0f8eccdfc5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Also update windows target to use latest windows version
Change-Id: If4e5568f4d138cba21296176e056757f59061bdb
Reviewed-by: Toni Saario <toni.saario@qt.io>
Removing python3.6 and replacing it with more recent versions.
Change-Id: If8cd4c369e4fc9ff8dc7d53865b80b588f278091
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 95e9f8da9a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Windows 11 21H2 will be replaced by 22H2 version
Task-number: QTQAINFRA-5203
Change-Id: Iad18055cf84d9c1ff38984611c820b1c23d663a2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
(cherry picked from commit 3d05c67749)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Update qdoc to a version that queries system include paths from the
compiler, avoiding spurious documentation warnings in some environments.
Update qtattributionsscanner to a version that fails the documentation
build on incorrect input, i.e. incorrectly formatted qt_attribution.json
files.
Fixes: QTBUG-108353
Change-Id: I3a64f7810cddafcbf9de66bd1d848c18f5677ad0
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
(cherry picked from commit 31c4ad1686)
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
The `libclang_version` variable is now updated to the current version, 15.0.0,
in both "coin/provisioning/common/unix/libclang.sh" and
"coin/provisioning/common/windows/libclang.ps1".
The naming of the artifacts for the provided library was slightly
changed from previous versions.
Before, the version number would contain two integers separated by a
dot.
The generated artifact would be named after this version number, with
the dot removed.
That is, for example, for version 12.0, a release artifact would be
called "libclang-release_120.*".
The updated two version uses a three segments version number and,
furthermore, the artifacts name do not collapse the separating dots such
that a release artifact would be called "libclang-release_15.0.0.*".
To support the new naming scheme, some processing was removed from both
provisioning scripts.
For Windows, the line removing all dots from the `libclang_version`
variable was removed.
For Unix, the removal of the dots in the `libclang_version`
variable when expanding the variable to generate the target urls to
retrieve the artifact was removed, using the bare value of the variable
itself.
For Unix provisioning, the artifacts for some of the platform, namely
"CentOS" and "Ubuntu 22.04", are not provided anymore.
"CentOS" was replaced by "Rhel8.4" on "gcc10.0", hence the target url
for the redhat platform was modified based on the new name.
The "Ubuntu 22.04" artifacts were not provided, such that the platform
was removed.
The sha1 of the target artifacts on both provisioning script was updated
for all platforms.
Task-number: QTBUG-107199
Change-Id: I873680825b0953e897c610fb0b47f3cd90625646
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit 487c92a3d0)
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>
(cherry picked from commit 6943f28b17)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
cmp command is used by ffmpeg ./configure
Change-Id: If80664d6c3318b7605c69d50e7606a1ec10840ea
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 817a6d07f8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
