Commit Graph

6466 Commits

Author SHA1 Message Date
Nils Petter Skålerud
189740e5e1 macOS ARM, Python: Combine Python provisioning into common script
The Python provisioning on macOS ARM hosts is done multiple times
across separate targets.

This patch moves the code into a common script 'macos/python-arm.sh'.
As a drive-by, we bump the version of all targets to 3.12.11, whch is
the same as the one used in the macOS 15 ARM host.

Pick-to: 6.10 6.8
Change-Id: I8c1f6f7d635fe47b9faa34dbe6988e89252dc2c9
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit f0b54a51f7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-12-19 14:04:53 +00:00
Nils Petter Skålerud
7b36e50c64 Provisioning: Use local mirror for pyenv on macOS ARM hosts
On macOS hosts we are using external mirrors for installing with pyenv.
We should instead pull the necessary files from our local mirror.

Pick-to: 6.10 6.8
Change-Id: I6ba67dfd7cd37809164c7e2c4bcf89d07d45b1b2
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit bb77943c0f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-12-19 14:04:53 +00:00
Joerg Bornemann
f1d54f955c init-repository: Fix passing no --alternates option
Commit d6918d7ac5 broke init-repository if
you did not pass an --alternates option.

Pick-to: 6.10 6.8
Task-number: QTBUG-142712
Fixes: QTBUG-142744
Change-Id: Ia727b420a34a46e52f0f05e549aabe2c975c6d7e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 6bd3b23b6c)
2025-12-19 15:04:53 +01:00
Joerg Bornemann
ec20fd6cab init-repository: Fix passing relative path to --alternates
When using --alternates with a relative path, nested submodules
(e.g., qtdeclarative/tests/auto/qml/ecmascripttests/test262) failed
because the alternates path wasn't adjusted for the changed working
directory depth. The --alternates option worked correctly with absolute
paths.

Fix by converting the passed alternates path to an absolute path.

Pick-to: 6.10 6.8
Fixes: QTBUG-142712
Change-Id: Ief7a87768d9ff17bb2832ae363f573ecae58d5ee
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit d6918d7ac5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-12-19 15:04:53 +01:00
Tim Blechmann
c3f0773ed2 provisioning: do not install libc++ on ubuntu
installing libc++-20-dev and libgstreamer1.0-dev on the same system
causes problems:
* using the llvm apt repo, it will uninstall libgstreamer1.0-dev
* using ubuntu's repo, it will break gstreamer's pkg-config integration

reason is that libgstreamer1.0-dev depends on libunwind-dev, but llvm's
libunwind-20-dev does not provide the pkg-config files.
as temporary workaround we basically revert
e5b56d1d37.

Change-Id: Ib4626d17339256d56c4764e3167f4e9fe4b9c909
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
(cherry picked from commit e9a003f0c3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-12-19 14:04:53 +00:00
Tim Blechmann
b8b7c30b2a Revert "platform_configs: add c++23 nightly builds - part 2"
This reverts commit 9073f03937.

Reason for revert: installing libc++ on ubuntu breaks gstreamer

Task-number: QTQAINFRA-7340
Change-Id: I8229f80a7010244fccc462eb31d1feadbf389028
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit 88173877d6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-12-19 14:04:53 +00:00
Alexandru Croitor
e171387d4c CMake: Modify the RunCMake tests to clone from the Coin CI git mirror
This helps with the test stability when code.qt.io is down or slow.

Pick-to: 6.10
Change-Id: I0bdaaa06772a94e73cb33d3f827e4e327123b60a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 160e6135bb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-12-18 23:00:32 +00:00
Oleksii Zbykovskyi
6e69c9f7a7 Rename 100... to 10... in Windows provisioning scripts
Renamed files since it leads to misunderstanding due to their index.
Our CI system sees only two first digits, so 100 is seen as 10
and executed with other 10s which is misleading.

Pick-to: 6.10 6.8
Change-Id: Iabb548c622d71df8a3593cc171b7e0c2e2ae0287
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit b276b549f7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-12-18 10:42:48 +00:00
Qt Submodule Update Bot
182960fb5e Update submodules on '6.11 in qt/qt5'
Change-Id: Ib07a72af7dbffaabc8214fb425e579663be9018d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-12-14 04:39:25 +00:00
Qt Submodule Update Bot
f00a460c60 Update submodules on '6.11 in qt/qt5'
Change-Id: I9207ec0945a946f08e952de36d68de4d2780df3b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v6.11.0-beta1
2025-12-12 04:19:43 +00:00
Eike Ziller
69a8b1abfe COIN/QtCreator: Move to RHEL 9 and macOS 15 for QtC 19+
Updating for raising the compiler requirements.
Also adds Ubuntu 22 to test with GCC 11

Since Qt Creator branches can use the same Qt branches
that define these platforms, keep one RHEL 8 job
for Qt Creator 18. Mark it in the features, so the
Qt Creator 19+ configuration can filter these out.

Pick-to: 6.10
Change-Id: Ib771f473b6ed3ce42c6191647da7d473b64c2316
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit dcd07cc2ab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-12-09 09:04:18 +00:00
Jani Heikkinen
c78156feca Adjust submodule branches
Change-Id: I5d87a40dc71574e17aa95accd460d8040cc64758
2025-12-08 06:00:14 +00:00
Qt Submodule Update Bot
15fa400d6e Update submodules on 'dev in qt/qt5'
Change-Id: I5e91ae5f8621838ebce9c5bd4aad7a694b1a33d1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-12-03 17:09:20 +00:00
Simo Fält
f3258b03de CI: Add Java QtBridges config on Win
Change-Id: Iae0915763c998a1eebad9dfd1f5080463ac597bf
Reviewed-by: Toni Saario <toni.saario@qt.io>
2025-12-03 07:22:33 +02:00
Tatiana Borisova
dedf0e4303 Update qtopenapi sub-module manually
- need to trigger an update for enabling changes required
for merging windows provisioning.

Change-Id: I8b5804c2bda2e4f4f4f204b0db95232583ac57e1
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2025-12-03 06:22:13 +01:00
Tatiana Borisova
45a5030192 Enable more configurations for qtopenapi on COIN
Change-Id: I1e0ef09e44b54cd44b377fb1ea34a3ad68e4f9f5
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
2025-12-03 06:22:09 +01:00
Ivan Solovev
6044f4fd12 Fix java provisioning on Windows ARM
The installer from Microsoft which is used for ARM machines has a
different default installation path compared to the installer from
Oracle that is used for x64 machines, but the provisioning script did
not take it into consideration.

As a result, the JAVA_HOME variable was pointing to a non-existing dir
on Windows ARM machines.

An attempt to adjust the installation path using TARGETDIR or INSTALLDIR
properties did not work, so this patch simply hardcodes the path that is
used by the current ARM installer.

Amends b3f5b4fd64 that added Java
provisioning to Windows ARM.

Task-number: QTBUG-138968
Pick-to: 6.10 6.8
Change-Id: I2abdc07195a9c633340c2d7b21deaa80762aee67
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2025-12-03 06:22:06 +01:00
Ivan Solovev
5293a1638e Fix maven provisioning script for Unix
- Rename the sha256 variable to sha1, because that's the actual
  algorithm that was used to calculate the checksum.
- Use the `version` variable when constructing `externalUrl`.

Amends 0ac4df3e52.

Change-Id: I79d38fdf5033dce7d0b04c2d8788767b2325895f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2025-12-03 06:22:03 +01:00
Ivan Solovev
5102a0cf07 Provision maven on Windows
It is required for qtopenapi.
The patch adds the maven provisioning to only those Windows
configurations that are currently used in qtopenapi.

This commit amends 0ac4df3e52 which
provisioned the same files for Linux and macOS.

Task-number: QTBUG-138968
Change-Id: I8ec903959c58185a5c46bdb7c13f178bdc10a109
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2025-12-03 06:22:00 +01:00
Ivan Solovev
48e66521cc Add qtopenapi Windows builds
- Add Windows configurations that use MSVC
- Provision openapi generator on the relevant platforms
- golang is already provisioned on all these platforms

The patch does not enable mingw and llvm configs, because
we need to build zlib using mingw first.

It also does not enable x64_64->arm64 cross-compile configs,
because they have a dependency on the mingw config.

Task-number: QTBUG-138968
Change-Id: I4fe35d149a1f9bfa93c1a128e5910b33aad536d4
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
2025-12-03 06:21:57 +01:00
Ivan Solovev
0719f922a1 Add openapi generator provisioning on Windows
Place the downloaded file into the new directory inside C:\Utils and
add it to the PATH, because that's what the qtopenapi build scripts
expect.

Task-number: QTBUG-138968
Change-Id: I113b0095074cc8f0dc0470daf54fa7f22ee22719
Reviewed-by: Toni Saario <toni.saario@qt.io>
2025-12-03 06:21:54 +01:00
Ivan Solovev
aecfc7e23b Set ZLIB_ROOT on Windows with MSVC
That is required for qtopenapi builds that would be enabled in the
follow-up patch.

The zlib library is already built after commit
97e80c1538. That commit also sets the
ZLIB_PATH_{arch} environment variables. So, we only need to set
ZLIB_ROOT to point to the proper zlib installation.

This patch does not cover llvm and mingw configurations, because we
need to builds zlib using these compilers first.

Task-number: QTBUG-138968
Change-Id: I5d5ad754d13bef9fc6184b41823a42d98863991a
Reviewed-by: Toni Saario <toni.saario@qt.io>
2025-12-03 06:21:51 +01:00
Qt Submodule Update Bot
ea8bd40e3d Update submodules on 'dev in qt/qt5'
Change-Id: I036e9ad47c3e9305f9cba7a838f53b72671b4f8e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-12-01 16:06:02 +00:00
Qt Submodule Update Bot
88db986ce7 Update submodules on 'dev in qt/qt5'
Change-Id: Ib541203ea1e1392d5cc97c800d9b6395c41855ee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-11-25 16:41:28 +00:00
Ville-Pekka Karhu
540d6a546c Provisioning: Ubuntu 20.04 to use new repo-clones
Task-number: QTQAINFRA-7546
Pick-to: 6.10 6.8 6.5 5.15
Change-Id: I70e87800049d8d3eb8466b90c9fc9974749e801a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2025-11-23 10:34:02 +02:00
Ville-Pekka Karhu
73eecc44e3 Provisioning: Ubuntu 18.04 to use new repo-clones
Task-number: QTQAINFRA-7563
Pick-to: 6.10 6.8 6.5 5.15
Change-Id: I965297a0d2442e7e3e45f4c68038b7950e0c8da0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2025-11-22 19:41:13 +00:00
Eike Ziller
d534aedb32 COIN: Add missing package for license-service library
libuuid is needed for it. RHEL 9.0 already has it in its package list,
but it was missing for the later RHEL 9 versions

Pick-to: 6.10
Change-Id: Ibd052438c534e5811d2f0b0ee848808227e795f9
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2025-11-22 20:41:11 +01:00
hjk
679593460e Disable Axivion reports for Qt-Security-QDataStreamOperatorRead
This currently flags 294 occurences in Qt Core as errors, practically
all of them related to the implemenation of QDataStream related
functionality.

I think this generally at the wrong level, certainly for Qt Core,
but also for user code: operator>> is (besides operator<<)
/the/ main reason to use the QDataStream class, so if we consider
this risky, QDataStream itself should not be used, i.e. it would
be better to flagging code that creates QDataStream objects not
every use of operator>> of such objects.

Change-Id: If758bde3a77f64cc8c06f8328459dfcd2d94dc8f
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2025-11-22 20:41:08 +01:00
Tero Heikkinen
cdf01ee62c sbom: New SBOM_PYTHON_INTERP_PATH env to use correct python3 for SBOM
To all linux, macOS and Windows platforms.

Task-number: QTQAINFRA-7554
Change-Id: I677440fb9faf3f3d36744b59f91f0036449b639b
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2025-11-22 21:41:06 +02:00
Elias Toivola
6384a76d09 Add Red Hat 9.6 with non-blocking tests in CI
RHEL-9.6 will be run in parallel with RHEL-9.4 with insignificant tests
until RHEL-9.6 is confirmed stable, then it will replace RHEL-9.4.
[CI Platforms]

Task-number: QTQAINFRA-7528
Change-Id: I5fe6bfe6f57f1dfb7ec4aeb05560dd7f01fc7f2f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
2025-11-21 18:13:43 +02:00
Qt Submodule Update Bot
1da3c607af Update submodules on 'dev in qt/qt5'
Change-Id: I0226a661ae506b1f3a3644a846750a8a1044f872
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-11-21 12:07:14 +00:00
Tero Heikkinen
82bedb07a1 Add more info how vcpkg install script works
Task-number: QTQAINFRA-7522
Task-number: QTQAINFRA-7455
Change-Id: I6ae31d66128d3238fa933249f0efe55169a6e52a
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Aku Pietikäinen <aku.pietikainen@qt.io>
2025-11-20 08:34:44 +02:00
Tero Heikkinen
1abd2e7028 Update Git version
Newer needed for openSUSE 16.0

Task-number: QTQAINFRA-7517
Change-Id: I636c0f293c78e8d8dcc0810c52589a0e7e809854
Reviewed-by: Simo Fält <simo.falt@qt.io>
2025-11-20 08:34:42 +02:00
Tero Heikkinen
4f405340c5 openSUSE 16.0: Upgrade openSSL from 3.0.7 to 3.5.4 (LTS)
openSSL 3.2.0 or newer required for libcurl in openSUSE 16.0

This solution has possibility to leave default openSSL
version into use for others, and openSUSE 16.0 (or others)
can move to a newer version if needed.

There are currently two tests failing in this update,
but as openSUSE 16.0 is non-blocking in the CI, it
doesn't get blocked.

Tickets created to fix those:
  - QTBUG-141722
  - QTBUG-141723

Task-number: QTQAINFRA-7502
Task-number: QTQAINFRA-7455
Task-number: QTQAINFRA-7452
Change-Id: Ie9995a3afcdb09d091d75651528a94f71f5ece2a
Reviewed-by: Elias Toivola <elias.toivola@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2025-11-20 08:34:40 +02:00
Tero Heikkinen
b5a3958912 Add openSUSE Leap 16.0 with non-blocking tests in CI
Notes:
  - GCC 15
  - Python 3.13
  - MimerSQL with openSSL 3
  - CINetworkTest skipped until newer ICU 77 version available
  - gstreamer-plugin-openh264 not available

Repository names have changed:
  - Old: /etc/zypp/repos.d/repo-oss.repo
  - New: /etc/zypp/repos.d/openSUSE:repo-oss.repo

Not installed by default, therefore no need to disable anymore:
  - balooctl
  - ntp

Task-number: QTQAINFRA-7455
Task-number: QTQAINFRA-7452
Change-Id: I2af7f828e07d31d3622cf46e819318c71d28783e
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Elias Toivola <elias.toivola@qt.io>
2025-11-20 08:34:38 +02:00
Qt Submodule Update Bot
2a97710d31 Update submodules on 'dev in qt/qt5'
Change-Id: If2fef4abde18b0450e9d58e8a3ac759f8c7e54aa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-11-19 18:57:22 +00:00
Qt Submodule Update Bot
f0ea8cbbd6 Update submodules on 'dev in qt/qt5'
Change-Id: Ib5499be291bab542febc7266f233aa69dea58841
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-11-18 23:19:12 +00:00
Simo Fält
94b2342dbb CI: Replace Ubuntu with RHEL while building Python for QtBridges
Change-Id: Id46857c7ea8f5576b5cf262f6d6662cb00666964
Reviewed-by: Toni Saario <toni.saario@qt.io>
2025-11-18 09:11:49 +02:00
Jani Heikkinen
2615a3e25e Qt 6.11: Add qtcanvaspainter submodule
Task-number: QTBUG-141970
Change-Id: I3559503f95ac22cb3077bea7a8d829619f40405f
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
2025-11-18 06:20:50 +00:00
Toni Saario
e3bd2b4440 Add qtcanvaspainter configs
Change-Id: Id49617f72084e4adb34b8b9305069c96a8f28788
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
2025-11-14 11:40:53 +02:00
Jani Heikkinen
b7aa99e265 Qt 6.11: Add qtopenapi submodule
Task-number: QTBUG-141811
Change-Id: I8276eb332e76388beca856a4cbc68e0926152f8e
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
2025-11-11 15:31:51 +00:00
Simo Fält
690479f129 CI: Enable network feature on macOS for QtBridges
Change-Id: I4cfdee0d0959492137ef13211fd8a83b0ff7b8db
Reviewed-by: Toni Saario <toni.saario@qt.io>
2025-11-07 12:25:23 +00:00
Simo Fält
52362d60d2 COIN: Add Python for QtBridges Windows config
Change-Id: I42a0231475db36ba76e2efe9b41e846c6145f197
Reviewed-by: Toni Saario <toni.saario@qt.io>
2025-11-07 11:39:16 +03:00
hjk
23cf42d87a Disable Axivion reports for Qt-FunctionArgsByValueRef
This is an unfortunate combination of clazy-function-args-by-ref and
clazy-function-args-by-value.

function-args-by-ref fixes are almost always safe to apply. They
actually may save an unbounded amount of cycles, and there are typically
only a few of them.

On the other hand, function-args-by-value is a mixed bag: There are a
lot of them and the expected gain is small: It's typically trading one
or two register for one register and a "hot" location on the stack.
Especially when passing down such objects to a through a sequence of
function calls this is not even necessarily a clear win on all
architecture.

In any case it should be considered that especially in the Qt context
changing signatures of public functions is not cheap, if possible
at all.

Change-Id: I281ea086fb15e0a045316591d9af620b5e730f4a
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2025-11-06 08:12:35 +01:00
Olli Vuolteenaho
af1067fa95 Build Qt Tools for Android Studio in CI
The binaries will be stored to ci-files02 after successful integrations
and the testing/release process will use those binaries.

Currently we can disable tests, as there are no unit tests in the
plugin itself.

Task-number: QTQAINFRA-7390
Change-Id: I7777ee47eed845022d67447a9389ab6943d69bc9
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
2025-11-04 13:11:25 +02:00
Qt Submodule Update Bot
e06039875d Update submodules on 'dev in qt/qt5'
Change-Id: Iacefb1df6cf835859f7d5706f5885d243f858c82
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-11-02 00:01:57 +00:00
Alexey Edelev
b64ad9500b Move the vcpkg baseline forward
Change-Id: Ic00b75b9973db5795e69ce70842a06fecbfadf35
Reviewed-by: Simo Fält <simo.falt@qt.io>
2025-11-01 01:52:02 +02:00
Alexey Edelev
63fd087fa0 Upgrade vcpkg to version 2025-09-03
Change-Id: I5501f28cbcf7cc9e88b32031a7fd2e1c763981bf
Reviewed-by: Simo Fält <simo.falt@qt.io>
2025-11-01 01:51:59 +02:00
Qt Submodule Update Bot
18c0ccd703 Update submodules on 'dev in qt/qt5'
Change-Id: Ie810a76640735ec21f13e48ae10b3c0db5f78bc8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-10-31 09:11:46 +00:00
Elias Toivola
4dcaf6ec01 Android: move platform dependency from RHEL 8 to RHEL 9
Pick-to: 6.10 6.8 6.5
Task-number: QTQAINFRA-7498
Change-Id: I48a72860fe9d06cde1f014298e68fa28caff730d
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
2025-10-30 13:52:12 +02:00