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>
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>
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>
Ffmpeg was not compiled because of failed yasm installation
on msys2. The installation failed due to checking pgp signatures.
Current fix adds keys refreshing that fixes the problem (checked
on CI and on local machine)
Note, currently the ffmpeg build works with msvc and mingw,
additional settings for llvm should be added in next commits.
Build example:
https://testresults.qt.io/coin/integration/qt/qtmultimedia/tasks/web_qt_qtmultimedia_1667916985085
Change-Id: Iff305e896bfb382c0c4030235cc2ad942cbbc002
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit bc5662c050)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Running vsinstaller twice seems to cause problems. Second installation
get stuck and it can't be used again. Seems like somethin get corrupted.
Task-number: QTQAINFRA-5090
Change-Id: Ic638879ea2f70bc74c028bff24daceb50e98480d
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
(cherry picked from commit 2a7c08f591)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
One of the QtMultimedia backends is implemented using FFmpeg.
This provisioning enables building and testing of this backend.
Change-Id: Ia196c2ae4b457aa6b8e3ee8e0f367197aadfe0d9
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit a273e9f11c)
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Update Squish to 7.0.1, include versions with Qt6.3 and 6.2 support.
Change-Id: I2bd7cd51a41befdbf2ef242eb72c2c2add84f733
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 6754cb362a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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>
(cherry picked from commit 8a72b1de99)
This fixes some threading bugs
Change-Id: I8025cd96ee5737deb04a571cc35eec8b26820039
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
The calling script for each platform missed the leading ". " so
powershell never executed the script. Sadly, provisioning still
succeeded.
Add some log output to the script doing the work to verify that
the file system is what is expected to be at the end. If it's not,
then the cd'ing into the shares will fail and the script will
return with a non-zero exit.
Change-Id: I8fe85c7e202132525876cdddf41750732f69aaf9
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit aab85286b7)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Once these paths exist reliably on the Windows VM running the test, and
are shared, we can access them through UNC paths as
\\${COMPUTERNAME}\testshare
This allows us to remove dependencies to network infrastructure from
those QtCore tests.
The test needs to run last, as otherwise the Visual Studio installer
mysteriously fails to execute. So make some space at the end of the
script list.
Change-Id: Ie11b894f000722a7d99b2c5e279c1b0b63021003
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 72ac097082)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Add required configurations to Nightly run for building
Qt SW in Windows host for QNX OS.
Task-number: QTBUG-101292
Change-Id: I689abd6596bf1ab1f30ba07c198e12569dbf2164
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 857ae6e1e1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Copy-Item command does not throw by default. Thus, copying error is
not caught and the Download function returns without downloading from
the official site. Adding "-errorAction stop" makes Copy-Item to throw
an exception as expected in the script.
Change-Id: I889cccac775705613e641453aca9e0197645f344
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
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>
Used OpenSSL source package 1.1.1m was changed little bit. All
ANDROID_NDK_HOME strings were replaced with ANDROID_NDK_ROOT in
Configurations/15-android.conf file
Task-number: QTQAINFRA-4864
Task-number: QTBUG-101863
Change-Id: Ia3d82005734ba69f1cc85708c867ae1955938739
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 686481f48c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
3.0.0 has a critical bug which can cause linking failures
(see QTBUG-101267). Update to the most recent version
where the bug has been fixed.
Task-number: QTBUG-101267
Pick-to: 6.3
Change-Id: Ib2e6abb72eb50b77db63175bbbf4a88b5e3c3920
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Current provisioning installation is broken. Current package replaced
the old openssl-android-master-1.1.1m.zip and shasum changed.
Pick-to: 6.3 6.2 5.15
Task-number: QTQAINFRA-4848
Change-Id: Id5e3bc1a81f8b634668d189c7647eac7c612020a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Script is currently failing in windows and no one has noticed this.
So apparently script is not needed by any module. If this will be needed
in the future then script needs to be fixed and merged back to
provisioning.
Pick-to: 6.3 6.2 5.15
Change-Id: Ia3deb3011b0cb6a9e145d0f126d4ab6723ce79f3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
If there is an outdated MSVC installer bootstrapper an update to MSVC
might silently fail. Make sure that we update the bootstrapper before
calling the actual update.
NOTE! This change also upgrades MSVC 2019 version to 16.11.10
See https://developercommunity.visualstudio.com/t/setup-does-not-wait-for-installation-to-complete-w/26668
for some more information.
Pick-to: 6.2 6.3 5.15
Fixes: QTQAINFRA-4813
Change-Id: Ia595ceb5b373d1210670d3f357fb501bca1c8272
Reviewed-by: Toni Saario <toni.saario@qt.io>
Needed environment variables are set during emsdk installation when
installation is done using emsdk.git. But those are not set
as permanently. To have correct values we need to get them from
install environment and set them permanently for build environment.
Pick-to: 6.3
Pick-to: 6.2
Change-Id: Ifb80aa4a93608b79faffc8c59002c89804f60570
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
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>
emsdk 3.0.0 is the minimum/recommended version for
Qt 6.3.
The python/node/jre versions appear to be unchanged.
Remove the unused versionTag variable.
Change-Id: Ic7b72691295040f899a22c54066b0aea3995cd7a
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
This will reduce the manual work when updating emsdk version
This requires also python certificates to be installed
Pick-to: 6.2
Change-Id: Id33d73f67f3312a27e9660522e7ca7ce17a89dbc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
V2 mode causes conan to raise error when an feature that is being
deprecated in conan V2 is used. This allows maintaining V2 compatibility.
Pick-to: 6.2
Change-Id: I9c0cb70ce3a194966594d48433763e5423e187f1
Reviewed-by: Simo Fält <simo.falt@qt.io>
Due to existing conan file new versions of compilers etc. cannot
be used. Forcing Conan to generate a new one will allow using the
new versions in profile files.
Pick-to: 6.2
Change-Id: I5adc1a42a4d620656767eb1418f341ef50232f91
Reviewed-by: Simo Fält <simo.falt@qt.io>
This is required for the upcoming conan integrations.
Pick-to: 6.2
Change-Id: Id7d3390721e3521b8e6f1da8e7ab0aae5213c7af
Reviewed-by: Simo Fält <simo.falt@qt.io>
Tier 1 image includes all configurations from
pre-provisioning folder.
E.g. these are pre-provisioned:
Visual Studio 2015 version 14.0.25431.1 Update 3
Visual Studio 2019 + build tools version 16.11.5
Visual Studio 2022 + build tools version 17.0.0 preview 7.0
Visual Studio 2022 + build tools version 17.0.1
Task-number: QTQAINFRA-4512
Change-Id: Ieceff236a9c12f34dc772c89cb93ad99d38d7fe5
Reviewed-by: Toni Saario <toni.saario@qt.io>
Let's use this temporary hack so that we can get support
for setting Emscripten environment for Webassembly through qtbase
This change will be removed when we start installing emsdk using
emsdk.git. That installation process will automatically set emsdk_env.bat
Change-Id: I6eb417b28c9ca0cd01a743dea2fa38540fd4dcc3
Reviewed-by: Toni Saario <toni.saario@qt.io>
Let's script this so we can be sure which language settings are in use
Pick-to: 6.2
Pick-to: 5.15
Change-Id: Ibf9ee047ede78535d39e707fd669b8a0f407cf1e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Note! MinGW version is 9.0.0 but the GCC version
is 11.2 which is used with the naming of MinGW
Task-number: QTBUG-93479
Change-Id: I318a898c49bded60bb891b73109de829cb975750
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
... 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>
Update Vulkand version to 1.2.182
Include fetching from official location if cache is not available and
checking the shasum
Task-number: QTQAINFRA-4532
Pick-to: 6.2
Change-Id: I3c43b08170a1756f1ca896bd606af1a2f349d93c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
