Commit Graph
6357 Commits
Author SHA1 Message Date
Elias Toivola d587092f57 Android: move platform dependency from RHEL 8 to RHEL 9
Pick-to: 6.8 6.5
Task-number: QTQAINFRA-7498
Change-Id: I48a72860fe9d06cde1f014298e68fa28caff730d
Reviewed-by: Tero Heikkinen <[email protected]>
(cherry picked from commit 4dcaf6ec01)
2025-11-20 14:45:26 +02:00
Eike Ziller f7a9d1d907 COIN: Add missing golang/upx provisioning on macOS 15
Needed for Qt Creator, see the macOS 14 provisioning

493a11caee added golang for
macos-15-arm in the dev branch, but it is missing for 6.10

Change-Id: Ib037dbe2817a678cda4945a1044b9c55e2ad49cb
Reviewed-by: Marcus Tillmanns <[email protected]>
2025-11-20 07:58:32 +00:00
Qt Submodule Update Bot 883d4c2c62 Update submodules on '6.10 in qt/qt5'
Change-Id: I4fbe19347333be0ddf06c1440a8859855e52d639
Reviewed-by: Qt Submodule Update Bot <[email protected]>
2025-11-18 17:48:36 +00:00
Eike Ziller 22960e9c23 Revert "COIN: Remove 'Packaging' feature from rhel 8.10"
This reverts commit d7a082f08d.

Reason for revert: Since that configuration was exported for Qt 6.10.0,
we released Qt Creator 18.0.0 on this. If this becomes unavailable for
Qt 6.10.1 we'd need to drop a platform in a patch release of
Qt Creator, which would be ugly.

Change-Id: Ida56410c44a908a2fa8c0b6bada21be7cad8d390
Reviewed-by: Jani Heikkinen <[email protected]>
2025-11-11 13:05:27 +00:00
Qt Submodule Update Bot 9f81c8022d Update submodules on '6.10 in qt/qt5'
Change-Id: I4f5d9bd4493571561c1c13f743ed0c657c9cab80
Reviewed-by: Qt Submodule Update Bot <[email protected]>
2025-11-06 18:10:17 +00:00
Matti Paaso 5d37695091 Provisioning: Make bootstrap autostart run without terminal
Copy bootstrap autostart also into Ubuntu 24.04 aarch64

Pick-to: 6.8 6.5
Change-Id: If815476e072d62752d6ea0e5081ec982f2c8c6d9
Reviewed-by: Tero Heikkinen <[email protected]>
(cherry picked from commit 3ff6bed04a)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2025-10-31 13:42:38 +00:00
Assam Boudjelthia 3b502d8073 CI: add more options for Android emulator launcher and help section
Allow the emulator launcher to take new options that are commonly
used:
 * --window: shows the emulator window instead of running headless
 * --avd: set the emulator name instead of using the env var, this
          can be more intuitive and more expected than the env var.
 * --help: to guide users how to use this script.

Also, the script now will print a list of available AVD names to
use instead of the less obvious error of no AVD name provided
which forces the user to manually find the names first.

This also, sets the COIN_CTEST_RESULTSDIR to CWD in case
it's not set, this is the case when running as a debug VM.

Pick-to: 6.8 6.5
Change-Id: Id90ca2fddda713645e9c1621e346d73f1dc85ea1
Reviewed-by: Dimitrios Apostolou <[email protected]>
(cherry picked from commit 05f46d0e54)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2025-10-31 13:42:36 +00:00
Qt Submodule Update Bot f841bcf220 Update submodules on '6.10 in qt/qt5'
Change-Id: I786068429abf8484cd691457f8b90016a1db84c2
Reviewed-by: Qt Submodule Update Bot <[email protected]>
2025-10-30 14:33:58 +00:00
Matti Paaso 701af5adba Enable CWE checks to Axivion configuration
Task-number: QTQAINFRA-7401
Pick-to: 6.8 6.5
Change-Id: I3173acc2941e3811aeb7e56752a56125f00d8f89
Reviewed-by: Jukka Jokiniva <[email protected]>
(cherry picked from commit 9e2db25bd5)
2025-10-30 08:28:23 +03:00
Qt Submodule Update Bot 8884317031 Update submodules on '6.10 in qt/qt5'
Change-Id: Idce087dc6c2daa5773ea3623cf18a67654badc28
Reviewed-by: Qt Submodule Update Bot <[email protected]>
2025-10-29 14:47:44 +00:00
Nils Petter Skålerud 7515ceea5b FFmpeg, iOS: Automatically grab FFmpeg version in Info.plist manifest
Our iOS FFmpeg provisioning includes build info.plist manifest files
for the FFMpeg framework files. This manifest includes the version of
FFmpeg that we are deploying. This version string is currently
hardcoded and does not match the version we are actually building.

This patch changes the 'install-ffmpeg-ios.sh' script to
programmatically grab the FFmpeg version from our related scripts, and
inserts it in the info.plist manifest.

Task-number: QTBUG-136480
Change-Id: Iafeaade2ff6f2a933a0ba48749af459eef37ab51
Reviewed-by: Artem Dyomin <[email protected]>
(cherry picked from commit c3b80178ee)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2025-10-29 06:42:07 +00:00
Qt Submodule Update Bot 20bdec9719 Update submodules on '6.10 in qt/qt5'
Change-Id: I29c1dd4d28de372f4890dec090e9cf3abaac1ab8
Reviewed-by: Qt Submodule Update Bot <[email protected]>
2025-10-28 04:30:14 +00:00
Qt Submodule Update Bot d94cefd9de Update submodules on '6.10 in qt/qt5'
Change-Id: I5f6ef36f631efc40ef7a7e61b09caffdd40c605d
Reviewed-by: Qt Submodule Update Bot <[email protected]>
2025-10-24 16:06:06 +00:00
Matti Paaso adb56a0462 Update Axivion bauhaus-suite tool version
Task-number: QTQAINFRA-7438
Pick-to: 6.8 6.5
Change-Id: I7adc2cba468d73385c46731d7c18777599ca58fb
Reviewed-by: Jukka Jokiniva <[email protected]>
(cherry picked from commit 996d1ca0e1)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2025-10-24 11:55:10 +00:00
Qt Submodule Update Bot a0696f3513 Update submodules on '6.10 in qt/qt5'
Change-Id: Ib2acb864547f6974fe0bd48a8fae032e0f9f9d0b
Reviewed-by: Qt Submodule Update Bot <[email protected]>
2025-10-23 07:36:45 +00:00
Rami Potinkara 76ff4d7046 Android: Android 16 as maximum supported version
This patch
- Replaces Android 15 with Android 16 as a maximum version
- Sets Android 16 as significant and switches to r07 version

Task-number: QTQAINFRA-7301
Task-number: QTQAINFRA-7298
Change-Id: Ic2ac071da7ab1763225c82e441c27f60cc25fe06
Reviewed-by: Rami Potinkara <[email protected]>
Reviewed-by: Nicholas Bennett <[email protected]>
2025-10-23 07:36:44 +00:00
Rami Potinkara 88843f5d8b Provisioning: bump Android sdkBuildToolsVersion and sdkApiLevel to 36
This patch bumps:
-The sdkBuildToolsVersion used in Coin to 36.0.0
-The sdkApiLevel used in Coin to 36

Task-number: QTBUG-138550
Task-number: QTBUG-138549
Change-Id: Ic63cd28ba39743e517ea3a3e2f9ec08bd5dc3267
Reviewed-by: Nicholas Bennett <[email protected]>
Reviewed-by: Rami Potinkara <[email protected]>
2025-10-23 07:36:43 +00:00
Rami Potinkara e1261d44d1 Provisioning: update Gradle cache to Android SDK 36
This patch updates build.gradle to set compile- and
targetSdkVersion to 36.

Task-number: QTBUG-138552
Task-number: QTBUG-138549
Change-Id: I44be99956f39e7bc23e8c5a3d15289dfdd574921
Reviewed-by: Rami Potinkara <[email protected]>
Reviewed-by: Nicholas Bennett <[email protected]>
2025-10-23 07:36:41 +00:00
Pavel Dubsky a4d15afd8e Update FFmpeg version to n7.1.2
Task-number: QTBUG-140468
Change-Id: Ia77053bd4022a9691b4729e748884fd42ee2d1a8
Reviewed-by: Artem Dyomin <[email protected]>
(cherry picked from commit c3809a73ea)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2025-10-21 21:56:56 +00:00
Tero Heikkinen 75e83cd398 Linux: Fix SBOM verification error with pinned reuse 5.1.1 version
Task-number: QTBUG-140916
Pick-to: 6.8 6.5
Change-Id: I63893c434526d4d0a9767f418a3d3db154181071
Reviewed-by: Alexandru Croitor <[email protected]>
(cherry picked from commit ecce36a343)
Reviewed-by: Jani Heikkinen <[email protected]>
Reviewed-by: Pavel Dubsky <[email protected]>
2025-10-18 14:13:32 +03:00
Tero Heikkinen 70450e5953 Provisioning: Remove MinGW from Windows 10 x64
Task-number: QTQAINFRA-7463
Task-number: QTQAINFRA-7462
Pick-to: 6.8 6.5
Change-Id: Id607cb1d902ed50ed4e8e4dececeebf75724144a
Reviewed-by: Jukka Jokiniva <[email protected]>
(cherry picked from commit ddebcf8fd9)
2025-10-18 14:13:13 +03:00
Qt Submodule Update Bot 23f4a0a3bf Update submodules on '6.10 in qt/qt5'
Change-Id: I70405bd1b6ffc883aacec6329a79b16104b2d525
Reviewed-by: Qt Submodule Update Bot <[email protected]>
2025-10-10 23:57:21 +00:00
Tero Heikkinen b36caafbb0 Provisioning: Add MinGW to Windows 11 x64
Task-number: QTQAINFRA-7463
Task-number: QTQAINFRA-7462
Pick-to: 6.8 6.5
Change-Id: I5d1edf4700bcc37fb5700fc7000eaaf6be8d4fc2
Reviewed-by: Matti Paaso <[email protected]>
Reviewed-by: Aku Pietikäinen <[email protected]>
(cherry picked from commit 3ea24a5f48)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2025-10-09 16:59:30 +00:00
Qt Submodule Update Bot d14b139aae Update submodules on '6.10 in qt/qt5'
Change-Id: Ibb044aeb52ff32ea17d7cd262a13e8d9e232ddf1
Reviewed-by: Qt Submodule Update Bot <[email protected]>
2025-10-09 02:31:12 +00:00
Tor Arne Vestbø 30a99aabd3 Remove QNX provisioning from macOS Apple Silicon
The toolchain is x86_64 only, which trips up xcodebuild if Rosetta2
is not installed: https://github.com/swiftlang/swift-build/issues/836

We don't have any CI configurations that build QNX on macOS, so we
don't need to install it.

Pick-to: 6.8 6.5
Change-Id: I8714438c6373e613f28f67b48d2f4f78a723bc9d
Reviewed-by: Jukka Jokiniva <[email protected]>
Reviewed-by: Marianne Yrjänä <[email protected]>
(cherry picked from commit ed82b7ec6f)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2025-10-05 16:27:56 +00:00
Simo Fält 75948e5de6 COIN: Enable Accessibility service for Squish on macOS
Task-number: QTQAINFRA-7123
Pick-to: 6.9
Change-Id: I06aadb58583e073b13362ed20fae2550869a7c52
Reviewed-by: Ville-Pekka Karhu <[email protected]>
(cherry picked from commit 293714d7bd)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2025-10-03 05:02:45 +00:00
Matti Paaso 979b19c8b5 Provisioning: Remove python2 installation
Provision started to fail in python2 installation.

Task-number: QTQAINFRA-7459
Pick-to: 6.8 6.5
Change-Id: I3059615e8469bf935031791fa826452e01f4f972
Reviewed-by: Simo Fält <[email protected]>
(cherry picked from commit ab8b59805a)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2025-10-03 05:02:38 +00:00
Matti Paaso 97e9150dbe Provisioning: Fix pyenv installation
Task-number: QTQAINFRA-7439
Pick-to: 6.8 6.5
Change-Id: I02202d1b53ab5442e04b6e5c0d7ff3119686f117
Reviewed-by: Jukka Jokiniva <[email protected]>
(cherry picked from commit 986d4b8760)
2025-10-03 08:02:33 +03:00
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 <[email protected]>
(cherry picked from commit 75ae0803f3)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
Reviewed-by: Aku Pietikäinen <[email protected]>
(cherry picked from commit 5966e804b0)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
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 <[email protected]>
(cherry picked from commit cd85327e85)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
Reviewed-by: Tero Heikkinen <[email protected]>
(cherry picked from commit b050b59af6)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
(cherry picked from commit c781ce2c92)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
(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 <[email protected]>
Reviewed-by: Tero Heikkinen <[email protected]>
(cherry picked from commit c969215383)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
(cherry picked from commit bd0ad72d4c)
Reviewed-by: Jukka Jokiniva <[email protected]>
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 <[email protected]>
(cherry picked from commit dd97e540f8)
Reviewed-by: Jukka Jokiniva <[email protected]>
2025-09-26 23:33:39 +03:00
Simo Fält 0e6aa7277b Add qtbridges platform configs
Change-Id: Icf27ef835997c6d045b6ee31fb26c2def72574a3
Reviewed-by: Juha Vuolle <[email protected]>
(cherry picked from commit 9fca876677)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
(cherry picked from commit 05b5626379)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
Reviewed-by: Jukka Jokiniva <[email protected]>
(cherry picked from commit d9bd5f0fa0)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
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 <[email protected]>
(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 <[email protected]>
(cherry picked from commit 875297edfc)
Reviewed-by: Rami Potinkara <[email protected]>
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 <[email protected]>
(cherry picked from commit 8e70bbf9b1)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
(cherry picked from commit 66fd8fb132)
Reviewed-by: Tero Heikkinen <[email protected]>
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 <[email protected]>
(cherry picked from commit ed1fb09b63)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
(cherry picked from commit e6be06dfd1)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
(cherry picked from commit e8106d5615)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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ø <[email protected]>
(cherry picked from commit b8995e0ebc)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2025-09-16 05:55:48 +00:00