For the purpose of getting the list of already initialized
submodules, it suffices to parse only the local .git/config file
of a repository.
This avoids including the output of a global ~/.gitconfig file, which
might contain bracket symbols, and thus break parsing of active
submodules.
Pick-to: 6.8
Fixes: QTBUG-145559
Change-Id: Ie08d42f4fa7c9b9e975a027dd6f20419936a606d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit b679f634ea)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 13aef4ed7b)
This ensures that the RunCMake.InitRepository test will not fail due
to an outdated checkout of the qlitehtml repository in the Coin git
mirror.
Pick-to: 6.8
Fixes: QTBUG-148458
Change-Id: If37fdf1c1ff7e3c2337efe2da06570627e4dbccd
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 9136724f2e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 738bd44d38)
There's a tty check in qt_internal_foreach_repo_run.
The code reads tty_exit_CODE rather than the correct tty_exit_code.
In a non-tty context (when stdout is a pipe), /usr/bin/tty prints
"not a tty" and has a non-zero exit code, leading to stdout being
redirected to a file named "not a tty" in every submodule.
Use the right name.
Pick-to: 6.8
Change-Id: I6bba544aa0e3bbe2f09925cae56f303e70643681
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 8e218fec47)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 58e5ed9147)
Tier-1 image changes in -73:
- MSVC 14.44.35211.0
- Windows SDK 10.0.26100.7705
- installed .NET SDK
- Visual Studio now has 'ci_msvs' user added with a license to use
debugger tools.
Pick-to: 6.8
Task-number: QTQAINFRA-7726
Task-number: QTQAINFRA-5417
Change-Id: I67d5605c544228daa6bac502ac487d1d5060fd81
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 99c69904b8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 0681ab2022)
Changed firewall configurations in CI network caused W10 VMs to prompt
to select public/private network profile setting for the changed
network.
Set the network profile with a script to prevent this prompt reappearing
in build/test VMs.
Pick-to: 6.8
Change-Id: I6c71fd31cd3982742254edf508a0ccfc3d2ceeb6
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 862c3df5bf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 00a5d6521e)
Syft is a tool that scans package manager manifest or lock files and
generates an SBOM (Software Bill of Materials) file based on the
found packages. It can generated both CycloneDX and SPDX SBOM formats.
The tool will be used by the Qt for Python project to generate SBOMs
based on the python packages used during the build.
The tool is provisioned on all the platforms that have the
GenerateSBOM feature.
Pick-to: 6.8
Task-number: PYSIDE-3366
Change-Id: I1369f7b1b041b1fc0d8a56a20446df322d26d33a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 341fe4e602)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit b964248bc7)
The Coin hosts file fully overrides the SDP default, which
had 127.0.0.1 and ::1 entries. Combined with nsswitch
"hosts: files mdnsd dns" and resolv.conf -> 172.31.1.1, any
test resolving http(s)://localhost fell through to NXDOMAIN.
Fixes tst_QHttpServer (229 HostNotFoundError asserts) and
tst_abstractoauth2 (silent crash) on QNX 8.0 QEMU. Applied
to 710/ too so the same latent issue can't surface there.
Pick-to: 6.8
Change-Id: I2aaa782980cb44afe3499ba8bd35fd7d3c093043
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
(cherry picked from commit 00177db989)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit ae3c676594)
The FFmpeg components 'avdevice' and 'avfilter' are not used in Qt.
By not building them, we save some time during provisioning in CI.
Change-Id: Id9219f6c00bd48d35d1d5c5b87eecb45f8c16c45
Reviewed-by: Mikko Hallamaa <mikko.hallamaa@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Elias Toivola <elias.toivola@qt.io>
(cherry picked from commit 75a537b6d5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 5898343d28)
This prevents sneaky NDK overwrites if there is no versioning in the
.zip root directory.
Pick-to: 6.8
Task-number: QTQAINFRA-7069
Change-Id: Ib0bd30c27da316735001bc5027d1dac1f8ead703
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 7c5594ea08)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 41b643267d)
$VCPKG_ROOT/packages/ fills up later in install-vcpkg-ports.sh, clean up
at the end of that script.
This amends 75cdce7b2c
Pick-to: 6.8
Change-Id: I87cf73c5b46733141d017efa6d4a2e9e6c482424
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 5e9c31fe74)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 1864674381)
The TIFF and WEBP image format plugins opportunistically link the system
libtiff/libwebp whenever find_package() succeeds. When the Linux release
packaging host moved from RHEL 8.10 to RHEL 9.6, libtiff-devel became
present (pulled in transitively via gtk3-devel), so the shipped libqtiff
plugin gained a hard dependency on libtiff.so.5, breaking on hosts that
ship a different libtiff soname (e.g. libtiff.so.6).
Pin tiff and webp to the bundled copies in the Linux desktop packaging
configurations (rhel-9.6 and ubuntu-24.04-arm64) so the released
binaries stay self-contained regardless of what is installed on the
build host.
Fixes: QTBUG-147470
Change-Id: If406fd6b9338af51176b50c3af5bb3193fd226fd
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
(cherry picked from commit 2882b5615b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit e8168e9ad9)
We need to build it as no official pre-built binaries with
multiple targets exists of rust.
Change-Id: Ibbe5dd77a92e845ce312f2ddf324a30b4c5ddc72
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 01ed52ad4c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 91970290eb)
Contains the .m2 folder from home after openapi build. Extracts it
to VM at same path.
Change-Id: I3eb5858160db1c996f3c72fae2b91be1478f000c
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Elias Toivola <elias.toivola@qt.io>
(cherry picked from commit adc52dde71)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit eb33647a48)
To build / test Qt on a fresh VM, all provisioning scripts have to be
run.
Provide a shell script to facilitate this on Windows.
Fixes: QTQAINFRA-7906
Pick-to: 6.8
Change-Id: Ib06f75d7402f72e0496bab35aeb2ac89d1064537
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 4f97b4bea8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 21de9acbb0)
To build / test Qt on a fresh VM, all provisioning scripts have to be
run.
Provide a shell script to facilitate this on Linux and macOS.
Fixes: QTQAINFRA-7906
Pick-to: 6.8
Change-Id: Ie06c11c824897d23c74d90c008a595c2f82f6950
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit c0e391423d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 707c9b73d1)
Also set SCCACHE_DIRECT in an effort to counter the error:
cc1plus: error: .../CMakeFiles/....dir/cmake_pch.hxx.gch: \
created by a different GCC executable [-Werror=invalid-pch]
Pick-to: 6.8
Change-Id: Ic7a3743642ff69495309794f6d17fc9b98d7f338
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 23c201ac4e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 9ce7dff139)
EPEL 10.0 has been moved under `archive.fedoraproject.org` now that
10.1 is the current release, so the pinned baseurl on `dl.` 404s and
breaks provisioning. Switch to the archive URL to preserve the
exact-release pin.
Change-Id: I0bff932e4aaa11515ca28aa18af5cea73a9e2b05
Reviewed-by: Elias Toivola <elias.toivola@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit f0ab3c330f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit a35949147c)
Increase image disk size to 300 GB.
Task-number: QTQAINFRA-7890
Change-Id: I7e0d84007ae448d14f2f8246fd8c7bc2a5e505af
Reviewed-by: Simo Fält <simo.falt@qt.io>
Increase image disk size to 300 GB.
Task-number: QTQAINFRA-7880
Change-Id: I0382d1a23fb54db365d79663ab59753427f72f75
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 57901788c3)
Mirror the existing Windows qnx710.ps1 for the 20260410 SDP
patchset and pull the 2026a tzdata overlay alongside it, same
pattern as the Linux common/linux/qnx_800.sh script.
Pick-to: 6.10
Change-Id: I5b718de8274ba2e1dc174199736c26ecdb5ea44e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 18f42f3a87)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
It makes little sense to carry these around when they don't compile
and require users to use a Perl script instead of raw git commands to
establish a working qt5.git, or else keep them wondering about these
dead bodies laying aorund. If someone wants to work on them, we can
always partially revert this commit to bring them back.
With this patch, you can now just
git clone path/to/qt5.git
cd qt5.git
git submodule update --init --recursive
and you're set.
Pick-to: 6.8
Change-Id: Iac0cf516eca7169fb092aa3e86de1722d0ac9c5b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit 669f354e20)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
- the 7.18.0 has generation updates, that affect the code
generation. We already moved to 7.18.0 on Linux and MacOS CIs,
but forgot to update on Windows. See:
e5871fa6e6
Noticed the problem during the work on a 'nullable' feature,
that is not supported by 7.15.0.
Change-Id: I9be758218831aae47d7cc9cb1d2dbf60795e6d27
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit 564ea220a3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This reverts commit 7f2d96a43e.
Reason for revert: Repo-clones for RHEL 9 skips distro version lock.
Correcting this in repo-clones will take time, so temporarily revert
this change to use external repos until repo-clones for RHEL 9 is ready.
Pick-to: 6.8
Task-number: QTQAINFRA-7810
Change-Id: Idc5d49be02e6ae763129cd2299b8725ae4de7892
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit 72a7e5c4db)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Intel image also has an update to coin bootstrap agent to lower MTU to 1496
Pick-to: 6.8 6.5 5.15
Task-number: QTQAINFRA-7854
Change-Id: Icac411ad0c4fdf4d64a673156cf33ea3f7f94a51
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 5eacf857aa)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
We dropped support for AAOS10 already in QtAA 6.9, but forgot to update
the minimum SDK version in CI.
Fixes: QAA-3464
Change-Id: Iaba6fb08bb6b00f7c01132e7cd528c4727a31859
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit bdff386c19)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
The packages required for FFmpeg provisioning may change between FFmpeg
versions, as is the case when upgrading to FFmpeg n8.1. It is a
time-waster to manually go through all hosts to make sure they all
have the correct packages. Additionally we have no way of knowing
whether a package is used by FFmpeg and/or something else.
This patch moves the list of required FFmpeg packages into some common
files, and refactors each host to read these files. This way we can
modify provisioning in one place.
Change-Id: I31d409595b7da231b1f845c18095e77f7af51b0a
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Elias Toivola <elias.toivola@qt.io>
(cherry picked from commit 8adbc25578)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
It's a new fork under a qtbuildsystem group, but with the contents of
the aledelev fork.
The older mrmsdbdl fork is not used anymore, so it's removed.
Pick-to: 6.8
Change-Id: I641cf8b86e3809f399cfddbe6c5d71ee6174917c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit ef53692f29)
These scripts are generic for both linux and macos, we may parameterize
them and reuse on both platforms.
Change-Id: Ia61cfbbf5c91e2135e38253c4a96605015d2d1b6
Reviewed-by: Alexey Edelev <semlanik@gmail.com>
(cherry picked from commit 4456a7f592)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Qt Submodule Update Bot