Commit Graph

6329 Commits

Author SHA1 Message Date
Matti Paaso
7aea7dfbc5 Provisioning: Update Axivion bauhaus-suite license file
Task-number: QTQAINFRA-7433
Pick-to: 6.8 6.5
Change-Id: I04fc35138d53bfe19fb7e94e9955923188e43582
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 75ae0803f3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-30 20:33:56 +00:00
Ville-Pekka Karhu
b77dae62d5 Provisioning: Ubuntu 22.04 to use new repo-clones
Task-number: QTQAINFRA-7426
Pick-to: 6.8 6.5
Change-Id: I868644526ddeb50e15b69f87263ea9bcf9021a8a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Aku Pietikäinen <aku.pietikainen@qt.io>
(cherry picked from commit 5966e804b0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-30 10:22:42 +00:00
Qt Submodule Update Bot
d5be221d9f Update submodules on '6.10 in qt/qt5'
Change-Id: I05e83301185f83dc139649c694859e50c34f7a90
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-09-30 03:24:35 +00:00
Dominik Holland
7f7a702ea9 Provisioning: Downgrade python 3.13. to 3.12 for macOS packaging config
Nuitka doesn't support Python 3.13 yet.

Change-Id: I577237b50e16053346d6adbb137a63a0ba41257b
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit cd85327e85)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-29 05:32:53 +00:00
Elias Toivola
1695377527 Windows: set cache URL for nuget
The directory and file did not exist in cache. Added them and this
change sets versioning to the nuget file name in cache.

Task-number: QTQAINFRA-7264
Task-number: QTQAINFRA-7265
Change-Id: I4cf7ce1b547bd8cd4272a981de6845c06a4d1d79
Reviewed-by: Aku Pietikäinen <aku.pietikainen@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit b050b59af6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-28 15:06:29 +00:00
Elias Toivola
d6a6f98789 Android: Fix cache URLs
Pick-to: 6.9 6.8 6.5
Task-number: QTQAINFRA-7264
Task-number: QTQAINFRA-7265
Change-Id: I68cf0dc47c50bb7a817860d6607db5910225996a
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit c781ce2c92)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-28 15:06:23 +00:00
Patrik Teivonen
6ae4ca39cd Add Initial Qt Configuration for Quick Bridge
Task-number: QTBUG-138793
Change-Id: Iba4abb44b30b562e96559f180c45414c0517288b
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
(cherry picked from commit a1b62a1b38)
2025-09-26 20:33:44 +00:00
Simo Fält
18adb02915 Provisioning: Update dotnet installation
Install missing workload module.

Change-Id: I8ec4e5389000f043d296d87e7c3fed8e06451cf3
Reviewed-by: Elias Toivola <elias.toivola@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit c969215383)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-26 20:33:42 +00:00
Tero Heikkinen
0d6a9c09ce Windows ARM: Rename WoA 11 23h2 IDs by removing extra -23H2
Change-Id: I53f3f44eab9a26cb75683b89e7d6984c305a5c10
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
(cherry picked from commit bd0ad72d4c)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2025-09-26 23:33:40 +03:00
Tero Heikkinen
8a4def3f83 Remove Windows 11 22h2 ARM from CI
[CI Platforms]

Task-number: QTQAINFRA-6973
Change-Id: I646cf19681e9224783271753ddc5fb74a5b59862
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit dd97e540f8)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2025-09-26 23:33:39 +03:00
Simo Fält
0e6aa7277b Add qtbridges platform configs
Change-Id: Icf27ef835997c6d045b6ee31fb26c2def72574a3
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
(cherry picked from commit 9fca876677)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-26 20:33:37 +00:00
Rami Potinkara
09622b6cca Android: FFmpeg to support 16KB page sizes on Windows
This patch introduces 16KB page size support for Windows
host to do Qt for Android build.

Currently Windows only builds FFmpeg on armeabi-v7a ABI.
32-bit ABI's like armeabi-v7a do not support 16KB page
sizes so the build is done for 4KB page size.

Amends ce488ecbc125cb3484f1cbed592ac9e28867eb66

Task-number: QTBUG-139762
Pick-to: 6.9 6.8 6.5
Change-Id: Ife7d56dd4a9f6d2892127571cab616b3f861dee6
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit 05b5626379)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-26 20:33:35 +00:00
Teemu Holappa
332b8beb7d Remove MSVC 2022 ARM64 configurations from QtSafeRenderer builds
Change-Id: Ibadf105cf5f60a7e0c8c2416ddbd09bf5dbec61f
Reviewed-by: Jussi Witick <jussi.witick@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit d9bd5f0fa0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-26 23:33:33 +03:00
Tero Heikkinen
26fe4e642e macOS: Fix mdutil unknown indexing state in provisioning
Task-number: QTQAINFRA-7377
Change-Id: Idf0dc607a4c6f7299412f6979f9ea6de5ea522cb
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2025-09-26 11:22:33 +03:00
Aku Pietikäinen
775fff4d4a Use common p7zip install script and remove unnecessary brew update
Change-Id: Id704953bf2eb9a2cfb11dbdb47451aed7bbc736b
Task-number: QTQAINFRA-7381
Pick-to: 6.9 6.8 6.5
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 1126034d5b)
2025-09-26 11:22:29 +03:00
Rami Potinkara
331f753f6f Android: FFmpeg to support 16KB page sizes
This patch adds needed linker flags for FFmpeg Android
compilation to get FFmpeg binary to be compliant for
16KB page size. 16KB page size is compliant with 4KB
page size.

This patch updates Android OpenSSL to be version 3.0.7,
which is build with two NDK's: NDK27c and NDK29-beta2.
Both with 16KB page size support. They are build with
https://github.com/KDAB/android_openssl/pull/69 just
changing OpenSSL version from 3.1.1 to 3.0.7 and NDK
version from 25.2.9519653 to 27.2.12479018 (27c) and
another build with 29.0.13599879 (beta2). The both build
artefacts are added to CI-files to be usable.

As the 16KB page size is applicable only to 64-bit ABI's
this patch adds the variable to 90-install-ffmpeg.sh files
for android-x86_64 and android-arm64.

Change is picked to all branches using Android 15 or newer
as Android 15 introduced the 16KB page size support.

Fixes: QTBUG-139762
Pick-to: 6.9 6.8 6.5
Change-Id: I50bab81b97dad3e9d8c1e834c1928949d1e19687
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit 875297edfc)
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
2025-09-26 11:22:27 +03:00
Paul Wicking
1e9ca6fdf2 Fix comment in _clang-format
The previous comment referenced a specific bug report but didn't
clearly explain the intent. Replace it with a more general note
clarifying that comment reflow is disabled.

Task-number: QTCREATORBUG-30304
Pick-to: 6.9 6.8 6.5
Change-Id: I963a3585a20e089df5e5bf71b638e9fc4b15542f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit 8e70bbf9b1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-22 12:14:49 +00:00
Matti Paaso
0fd9e9f0b6 Provisioning: Fix macos nodejs installation
Brew install started to fail on older macos arm versions. Getting
rid of all brew install to avoid future problems with it.

Task-number: QTAINFRA-7408
Pick-to: 6.9 6.8 6.5
Change-Id: I22eddfad1f49b0814841a5d554100fdffd329593
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 66fd8fb132)
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
2025-09-20 14:27:53 +03:00
Mitch Curtis
156b753fc5 _clang-format: set ReflowComments to false
This causes issues with incorrect indentation of comments, as explained
in the linked bug report.

Task-number: QTCREATORBUG-30304
Pick-to: 6.9 6.8 6.5
Change-Id: I6951bc7bf42990b8671cf99b04b8ca7bed1d24cb
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit ed1fb09b63)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-19 06:36:02 +00:00
Simo Fält
d7a082f08d COIN: Remove 'Packaging' feature from rhel 8.10
The release config was replaced with rhel 9.2. There is no need
to export 8.10 artifacts anymore.

Change-Id: I64fe163a1ab22f4275a8c449f18b3c51d71f8633
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit e6be06dfd1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-16 12:20:29 +00:00
Simo Fält
513af7962d Provisioning: Update python 3.9 to 3.13 for macOS packaging config
After swapping the packaging node from x86_64 to arm64 the
default python got downgraded from 3.11 to 3.9.

Change-Id: Iea65e3c3d959c22e1a12d2a4f12ba466de4dbf24
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit e8106d5615)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-16 05:55:49 +00:00
Toni Saario
b8441b17f9 Delete macOS GCA keys and dhcp lease after provisioning
This ensures that link-local IPv6 address is unique per
each VM.

Task-number: QTQAINFRA-7383
Pick-to: 6.9 6.8 6.5
Change-Id: I53434ec3a158cec09f03c96087a401ef05f47b86
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit b8995e0ebc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-16 05:55:48 +00:00
Elias Toivola
033ea9e0d5 Windows: Add a helper to cleanly invoke NMake with zlib
Invoke-NMake helper temporarily clears MAKE flags, such as
MAKEFLAGS='-j8', to prevent errors from GNU-style flags and to reduce
flakiness with NMAKE.

The helper is used to build zlib and to prevent:
error U1065: invalid option '-'

Pick-to: 6.9 6.8 6.5
Task-number: QTQAINFRA-7363
Change-Id: Ia80216677eba6fd8f8364741b6999e6155d678ab
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit 0f3d085101)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-16 05:55:47 +00:00
Tero Heikkinen
c86052205a Windows: Add virtio driver version to provision log
With possibility to extend other drivers's versions into log

Task-number: QTQAINFRA-7168
Pick-to: 6.9 6.8
Change-Id: Ib10887fb904a75ccbb91bef2e9be0e83625da784
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
(cherry picked from commit fc6aa80d32)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-16 05:55:46 +00:00
Tero Heikkinen
d7818854a3 Make Windows 11 23h2 ARM tests as blocking in CI
[CI Platforms]

Task-number: QTQAINFRA-6973
Pick-to: 6.9
Change-Id: I92c4785eea01dabc31e4ce5a38e8af47fad70a1d
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 420b7fe88a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-12 04:32:25 +00:00
Tero Heikkinen
27181052ec CMake: Force build tools when cross-compiling for Windows 11 23h2 ARM64
(Extends 9254959ace to WoA 11 23h2)

Pick-to: 6.9
Task-number: QTBUG-138859
Task-number: QTQAINFRA-6973
Change-Id: I745f3276b115331d18ba6a9517b9d361697214a9
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 1fbc552781)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-12 04:31:54 +00:00
Jukka Jokiniva
4953664b49 Update qt3d submodule
Change-Id: Ia511c0944349a24afe2acfbb783ec73e6edd2c78
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2025-09-09 09:19:50 +03:00
Simo Fält
e6eaa4f3ef COIN: Fix Debian bookworm pgp key in Ubuntu 22.04 for debootstrap
Pick-to: dev 6.9 6.8
Change-Id: Ie06c37987cf21ee0f8f60528af5d70cbf8b5490d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2025-09-09 09:19:47 +03:00
Assam Boudjelthia
cbbba28284 Android: update provisioning to Gradle 8.14.2 and AGP 8.10.1
Task-number: QTBUG-137782
Change-Id: I522a7179e1a0be7c7bb876d935fd02ef7e049475
Reviewed-by: Simo Fält <simo.falt@qt.io>
2025-09-09 06:19:44 +00:00
Rami Potinkara
9f42f33194 Android: Fix Android 16 emulator CI start problems
This patch updates the fully booted check for Android.

Old logic used init.svc.bootanim property and it's status
"stopped", but since Android 16 forward the status is kept
empty "" if "-no-boot-anim" emulator startup parameter is used.

The new logic simplifies old and relies only to two values:
sys.boot_completed and dev.bootcomplete. These work similary
from Android 9 to 16.

Task-number: QTQAINFRA-7299
Task-number: QTQAINFRA-7298
Pick-to: 6.9 6.8
Change-Id: I62efb0b05cd9792f92040dcb98a37f4bf14022e6
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Elias Toivola <elias.toivola@qt.io>
(cherry picked from commit 0eb085f93d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-09 06:19:42 +00:00
Simo Fält
4bb846dd6d COIN: Fix Debian with missing debootstrap key
Pick-to: dev 6.9 6.8
Change-Id: I61f6a4834b034bb52323416499d71543f290ccf6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2025-09-09 09:19:39 +03:00
Aku Pietikäinen
19b819ebf3 Update homebrew to version 4.6.8 and git to latest installer
Change-Id: I2c13ce86b3aceae47afab7e1af1489c2d355aad2
Pick-to: 6.9 6.8 6.5
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit ae2ae67c61)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-09 06:19:37 +00:00
Nils Petter Skålerud
dd4278ddc1 FFmpeg, Android: Add support for Android ARMv7 in Unix FFmpeg script
This patch introduces support for building FFmpeg for Android ARMv7
on Unix hosts.

Pick-to: 6.9 6.8
Change-Id: I21affa1137cb4b3aa3a5b9cfd5c71e755684db9c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
(cherry picked from commit 4170b81aea)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
v6.10.0-beta4
2025-09-05 05:26:57 +00:00
Ville-Pekka Karhu
c25feffb9b Provisioning: Take repo-clones-apt into use in Ubuntu 24.04
Pick-to: 6.9 6.8
Task-number: QTQAINFRA-6297
Change-Id: I7d9b3edc2b2429361e421ce13b5c36f4247693f6
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit 13487118df)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-05 05:26:53 +00:00
Tero Heikkinen
7394584ab5 Linux: Fix Debian packagekit failing in provisioning
Target jammy-arm64-debian-pkg-packaging fails in
waitLoop function, which is also used by Ubuntu platforms.

Fix by extending wait loop for lock paths:
  - /var/lib/dpkg/lock
  - /var/lib/apt/lists/lock (new)

Task-number: QTQAINFRA-7361
Change-Id: If8d5eacaeb72ea6a36496093bc5c248f61997afb
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2025-09-05 08:26:48 +03:00
Toni Saario
a64f150422 Cache maven dependencies for californium build
The fetching from 3rd party repos has become very flaky.
To avoid mirrors throttling us and other flaky issues cache
the dependencies and set -o to enable offline mode.

This seems to also speed up the step considerably.

Pick-to: 6.9 6.8 6.5
Change-Id: I01663e60baa44ab828d8880ab8b346034a50b60e
Reviewed-by: Simo Fält <simo.falt@qt.io>
2025-09-05 05:26:43 +00:00
Nils Petter Skålerud
18a08f7eb6 FFmpeg, Android ARMv7: Use correct build folder when fixing deps
This patch amends 133de012af95507ac485845d8de8f58da005df64.

The previous patch introduced a regression where the newer build paths
were not being passed correctly into 'fix_ffmpeg_dependencies.sh'
during FFmpeg Android builds.

This patch introduces a common function to resolve the installation
directory, which is then used both during compilation and during
FFmpeg patching.

Additionally, it introduces some basic error-handling when running
'fix_ffmpeg_dependencies.sh' so that we can catch this issue in
integration, in the future.

Fixes: QTBUG-138615
Change-Id: I195ebd3034a3184bad32e75916a41a20838b2db1
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 7f416abf32)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-05 05:26:40 +00:00
Nils Petter Skålerud
14dcdd32d7 macOS, FFmpeg: Don't use patchelf 0.18 for Android FFmpeg patching
At the time of writing, homebrew ships patchelf version 0.18.0. This
version of patchelf has a bug specific to Androd binaries. The macOS
14 arm64 host currently uses this version of patchelf. This causes an
issue during runtime linking in Qt Multimedia applications on Android.

This patch modifies the macOS 14 arm64 host to use patchelf v0.17.2
that we compile from source. It also adds warnings to the provisioning
log should someone try to use v0.18.0 in the future.

Fixes: QTBUG-136930
Pick-to: 6.9 6.8
Change-Id: Id66b560e6a1d4300a54017e9c3366720dc291944
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 61046109cf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-05 05:26:36 +00:00
Elias Toivola
c1798a5ea8 Android FFmpeg: Further fix FFmpeg build directories
This fixes "does not exist" errors when trying to build multiple NDKs.

This amends 303b4c13dc

Pick-to: 6.9 6.8 6.5
Task-number: QTQAINFRA-7069
Change-Id: I29f5cd85ffb3cf12a81b5816a5601ea37446042d
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit ffc15eb35f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-05 05:26:31 +00:00
Qt Submodule Update Bot
b00e1853b4 Update submodules on '6.10 in qt/qt5'
Change-Id: Ida27d2492476ba87e3fa3f6f7c0cc1e13d62297e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-09-05 05:26:22 +00:00
Axel Spoerl
582a05fab0 Make ubuntu-24.04-x64-x11-tests test insignificant
Ubuntu 24.04 installs Wayland by default. The X11 version is known to
be problematic, which is why ubuntu-24.04-x64-documentation-x11-tests
has been marked InsignificantTests.

Extend this to ubuntu-24.04-x64-x11-tests.

Task-number: QTBUG-137909
Task-number: QTBUG-136092
Pick-to: 6.9 6.8 6.5
Change-Id: I38f4bb5ca59255870dc6dbbb69e9ab339c679ddc
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit 75b7834370)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-02 14:04:01 +00:00
Tero Heikkinen
eb22c91aa5 Windows ARM: Remove Packaging flag from WoA 11 22h2 target
Target: windows-11_24H2-msvc2022-arm64

Task-number: QTQAINFRA-6973
Task-number: QTQAINFRA-6109
Pick-to: 6.9
Change-Id: I82153c08e327a211fd604f803b901370f06e35df
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2025-09-01 18:38:11 +03:00
Qt Submodule Update Bot
84833b070d Update submodules on '6.10 in qt/qt5'
Change-Id: I2470c30de154186f07ed83f7a71c4dba59cd1e3f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-08-30 23:52:07 +00:00
Aku Pietikäinen
014d327331 Use correct PATH for homebrew based on architecture
Task-number: QTQAINFRA-6903
Change-Id: I1b5f529e8e94a7e609b5be1704ed83f6380f4cc5
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit f73de1b6a8)
Reviewed-by: Simo Fält <simo.falt@qt.io>
2025-08-29 10:47:22 +00:00
Tor Arne Vestbø
ff0c5876af coin: Force detach Docker volume unmount
Change-Id: I6c19b374adf3d4cd75a3307474e973af96613378
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit e8f8c9e845)
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2025-08-29 10:47:18 +00:00
Aku Pietikäinen
d37592b726 Change libiodbc brew to use local tap
Installing directly from rb file no longer supported by
homebrew without HOMEBREW_DEVELOPER set after https://github.com/Homebrew/brew/pull/20414
was merged.

Create local tap for install to avoid need for homebrew developer mode.

Task-number: QTQAINFRA-7344
Change-Id: Id59af01875b16d1757b1dba36c2ba04bf973c212
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit a9b7487138)
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
2025-08-29 10:47:15 +00:00
Liang Qi
3d536d157d Revert "platform_configs: remove two u2204 tests"
Ubuntu 24.04 GNOME X11 still has too many flaky issues in our
CI, which blocks integrations too much.

This reverts commit e2e25e8a66.

Pick-to: 6.9 6.8
Task-number: QTBUG-137909
Change-Id: Ifcb56d0172b7bd0e66d1fe6e764ea6643b8e4834
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit da4d20137c)
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2025-08-28 10:23:23 +02:00
Liang Qi
ca83c9896a Revert "platform_configs: remove ubuntu-22.04-developer-build"
Ubuntu 24.04 GNOME X11 still has too many flaky issues in our
CI, which blocks integrations too much.

This reverts commit 6db000ab67.

Pick-to: 6.9 6.8
Task-number: QTBUG-137909
Change-Id: Iec2323da11354b3176c2428e441965b77fd768a1
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit e9f41970c4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-08-28 10:23:21 +02:00
Qt Submodule Update Bot
68425f29bb Update submodules on '6.10 in qt/qt5'
Change-Id: Ia9f4d1a7cb2ebc591ccd64f9d75872b15bd5e7ee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-08-26 02:00:02 +00:00
Liang Qi
feabc0fdcf Revert "platform_configs: remove InsignificantTests for u2404 x11 dev"
Ubuntu 24.04 GNOME X11 still has too many flaky issues in our
CI, which blocks integrations too much.

This reverts commit 365860ce42.

Pick-to: 6.9 6.8
Task-number: QTBUG-137909
Change-Id: I058c5d9c5e67bbea4a5ea88a915270ef00110d7a
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit e9687ee42e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-08-25 11:57:27 +00:00