Commit Graph

6099 Commits

Author SHA1 Message Date
Eike Ziller
c2fcaa2820 COIN/QtCreator: Update to qtci-windows-11_23H2-x86_64-54
Use same as other products

Change-Id: I2a289cce1a7716017bae6ad3f28d088e322fdc3a
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit 75f99d20a7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-03-03 09:25:19 +00:00
Qt Submodule Update Bot
faa1c2ba7a Update submodules on '6.9 in qt/qt5'
Change-Id: I2461cc9d2863d9d77c9bfc951fbd0cd95c5a25e4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-03-01 10:09:14 +00:00
Tero Heikkinen
ad3f5109f8 Disable Super-key causing windows-overview effect on SLES 15 SP6
(amends 8bec383a8e)

Pick-to: 6.8
Task-number: QTBUG-132070
Task-number: QTQAINFRA-6746
Task-number: QTQAINFRA-6745
Change-Id: Iae84ba6dabbc9b9f986b8d3fcf3805549e503704
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
(cherry picked from commit 3cbcfb2d52)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-28 19:05:53 +00:00
Tero Heikkinen
207ba9b605 Linux: Add GCC versions visible in versions.txt
Currently only SLES and openSUSE has GCC in versions.txt.
Will also make GCC versions visible in Tools and Versions pages.

Task-number: QTQAINFRA-5901
Pick-to: 6.8 6.5
Change-Id: I9742c3151e074c503947018a0c7f7c2e0c1077bd
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit 5f627786ef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-28 19:05:32 +00:00
Tero Heikkinen
b8778d4e63 Synchronize GNOME based Linux gsettings into a common script
Pick-to: 6.8
Task-number: QTQAINFRA-6967
Change-Id: Ib2f17a49931dc546af82f1e0384814f9f359a3f3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 98e55af0f2)
Reviewed-by: Liang Qi <liang.qi@qt.io>
2025-02-28 21:05:05 +02:00
Marianne Yrjänä
a47c2b4ec7 Provisioning: Separate QNX710 and QNX800 qemu configs
QNX qemu configs separated. QNX710 and QNX800 require different set of
dependency libraries and there's an extra image creation bug on QNX800
that needs workaround too.
QNX800 toolchain updated.

Task-number: QTBUG-131708
Pick-to: 6.8
Change-Id: I3bc5c8bb63abbb729d03fcf3afb2f7881bcdd270
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 4791054b10)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-25 08:12:54 +00:00
Rami Potinkara
7228be7f72 Provisioning: bump Android sdkBuildToolsVersion to 35
This patch bumps the sdkBuildToolsVersion used in Coin to 35.

Task-number: QTBUG-129461
Task-number: QTBUG-130283
Change-Id: I2e1fbdfd23cb854ec50625ff29331adc61abc32c
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2025-02-25 07:42:20 +02:00
Konsta Alajärvi
345aae01f5 Provisioning: bump Android sdkApiLevel to 35
This patch bumps the sdkApiLevel used in Coin to 35.

Task-number: QTBUG-129461
Task-number: QTBUG-130283
Change-Id: Ia26248982a2807b2d3554d1a7a7394efcf13f834
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
2025-02-23 07:39:53 +00:00
Qt Submodule Update Bot
6e5ad2a7e8 Update submodules on '6.9 in qt/qt5'
Change-Id: Iab5b7d7e49e13195b8e726778f2e35346164ff58
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v6.9.0-beta3
2025-02-21 20:17:48 +00:00
Paul Wicking
be88fababd Add .gitreview file
`git-review` is a command line tool for interacting with Gerrit.
Some IDEs offer support for this tool, either natively or through
plugins. The tool relies on a configuration file, .gitreview. Adding
this configuration file to our repositories simplifies initial setup
for contributors that use the tool directly or through their IDE of
choice.

The configuration file adds a remote called 'gerrit'. This is the
default for the tool, and also the name set for
codereview.qt-project.org by Qt's `init-repository` script. Thus,
the configuration should work seamlessly alongside other repository
helpers.

Task-number: QTBUG-132604
Pick-to: 6.8
Change-Id: Iea428aeaa1b4cdbaabd3477aaf061b8960efc887
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
(cherry picked from commit 9b8cb71d6b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-20 09:06:07 +00:00
Eike Ziller
626a22cc74 COIN/QtCreator: Move to Ubuntu 24.04 for ARM
Debian is no longer supported for Qt 6.8.1 and later

Pick-to: 6.8
Change-Id: Ic9ddac3d95451b900f60be6a90efd5fb32985601
Reviewed-by: Patrik Teivonen <patrik.teivonen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
(cherry picked from commit 014bdc24ab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-17 14:59:09 +00:00
Eike Ziller
db2d504099 COIN/QtCreator: Update to Windows 11 23H2
That is what we are using for packages too.

Pick-to: 6.8
Change-Id: I88ab02f577933292c882ec4633d9087b1bf957ea
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit 53280b0697)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-14 15:11:16 +00:00
Toni Saario
c03c22faae Remove PinCores features
Effect of this experiment was inconclusive. In some isolated cases
limited benefit was seen, but in overall metrics no change was
observed.

Remove the feature to gain the lost computing capacity back. If the
removal causes noticeably higher flakiness etc, it can be reevaluated.

Task-number: QTQAINFRA-6702
Change-Id: I001fc2d3740a287d4546d0f597e81ded9f5449cb
(cherry picked from commit 8d51e875cb)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2025-02-11 16:41:39 +02:00
Jøger Hansegård
3b9008ca75 Update Windows provisioning to use 7z version 24.09
Task-number: QTQAINFRA-6833
Pick-to: 6.8 6.5 5.15
Change-Id: Iebb1a6fe879e3b550479cf109df79199536742e6
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
(cherry picked from commit a1c47252fb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-08 02:28:06 +00:00
Timur Pocheptsov
27be5c2f98 Update provisioning script to build FFmpeg for iOS
as xcframeworks so that we can provide both arm64 and arm64-simulator
versions (the former can be used in App Store, the latter when
working with a simulator).

Pick-to: 6.8
Task-number: QTBUG-132313
Change-Id: Ic683f58dffcef8a06adb4a915c4e3abc4ab219e5
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 1968adc126)
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2025-02-05 17:38:56 +01:00
Tor Arne Vestbø
77a614d592 macOS: Set PostgreSQL_ROOT during provisioning rather than in each config
Decouples provisioning from build configurations.

Pick-to: 6.8
Change-Id: I53b0983ab8b20c40568c1b5b9a24bfe3c62cf531
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 7f51bdbd8d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-02 23:32:39 +00:00
Tor Arne Vestbø
55ef82de88 macOS: Set Protobuf_ROOT during provisioning rather than in each config
Decouples provisioning from build configurations.

Pick-to: 6.8
Change-Id: Ied2b60b360ef5ec5aab1dd4b2e6a0b81032d2938
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit ac2b15075c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-02 23:32:37 +00:00
Tor Arne Vestbø
1bb142175a Use correct path for libiodbc and forward via ODBC_ROOT env var
The hard-coded path paths added to LIBRARY_PATH and CPLUS_INCLUDE_PATH
was not correct on Apple Silicon Macs, where homebrew installs into
/opt/homebrew/.

There's also no point in passing on the library location via compiler
environment variables, when we can use ODBC_ROOT. And we don't need
to pass it on as a CMake define, as a environment variable works just
fine. This decouples the provisioning of libiodbc from the build
configurations.

Pick-to: 6.8
Change-Id: I40aa3c1852fb0baf3366fa1a9dab85a66eef95e2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 124957a8cb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-02 23:32:28 +00:00
Piotr Wiercinski
27b0c6daff wasm tests: Update Chrome to 131 and use headless mode
Newer version of Chrome together with healdess mode
should provide more stability.

Change-Id: Ifb6b326b90067d9e069ebef662356d28e2c9edd7
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
(cherry picked from commit ae85de3cf8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-28 22:40:59 +00:00
Qt Submodule Update Bot
ffb6de83c9 Update submodules on '6.9 in qt/qt5'
Change-Id: I5c2a745c3db8d7de6efa3466c82744eb7138302a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-01-28 03:03:18 +00:00
Piotr Wierciński
e732ea40d7 wasm: Update Emscripten to 3.1.70
Change-Id: I2a1250d2744d12f5d3f8122f7931c821c607f71b
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io>
(cherry picked from commit c052b991b0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-23 17:52:19 +00:00
Tero Heikkinen
4eac58fb7c Add Perl JSON module
Needed with all the machines generating SBOM

Task-number: QTQAINFRA-6871
Task-number: QTBUG-131434
Change-Id: I15a79c005f530c551f9026e2cbfb465ed1211e98
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 6c6faeefd2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-22 08:14:13 +00:00
Tero Heikkinen
1b6c7cfa17 SLES 15 SP5: Update timezone package
Updates:
  - Timezone package from 2023c to 2024a
  - qtci-linux-SLES-15_SP5-x86_64-50 --> 51

Task-number: QTQAINFRA-6901
Pick-to: 6.8
Change-Id: I8ae65d0f8729e9dcf9147f45b09279fb805027ef
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 8d0f126d85)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-22 08:14:11 +00:00
Matti Paaso
3579a0c95c Provisioning: Update Axivion bauhaus suite and license file
Task-number: QTQAINFRA-6880
Pick-to: 6.8 6.5
Change-Id: I92a70dcb14bbba0ded889894059f2de849b1f557
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 45491c61fc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-20 07:12:44 +00:00
Rami Potinkara
f537715537 Android: Android 15 as maximum supported version
This patch
- Replaces Android 14 with Android 15 as a maximum version
- Introduces Android 15 system image to CI cache
- Sets Android 15 as significant

Task-number: QTQAINFRA-6478
Fixes: QTQAINFRA-6652
Pick-to: 6.8 6.5
Change-Id: Icb6de43f3e2c2f7f98f3172c83d66bebf9603d24
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 2c85a91e07)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-18 15:31:45 +00:00
Michal Klocek
096d09d1a5 Add html5lib to python.3.11
RHEL 8 installs python3-html5lib, however this only affects
installed pythnon 3.6, webengine should use
3.11 therefore add it to pip installer.

The change for switching webengine to 3.11 is in
so installing of python3-htmllib can be removed.

Fixes: QTBUG-132584
Change-Id: Ia6f4262971f60b960a61a466f418750c0d956cbc
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit f8e873b188)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v6.9.0-beta2
2025-01-17 09:45:22 +00:00
Alexey Edelev
5b0d2e87d0 Disable top-level configure run for the cross-builds
The 'target' configurations currently trigger the 'host'
configure command line, and are duplication of the existing
rule we have for the host machines. Disable the top-level
configure checks for the 'target' builds completely.

Fixes: QTBUG-132799
Pick-to: 6.8
Change-Id: Ia06dde53825e882e78a8c6be9e62779aaedcebf4
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 6f0c6b1614)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-16 14:17:02 +00:00
Tor Arne Vestbø
81f7f5b413 Enable crash reporting via Swift on macOS 15
Swift 5.9 includes built in crash reporting, printing stack traces,
libraries, and registers to stdout/err.

https://www.swift.org/blog/swift-5.9-backtraces/

As (Core)Foundation is written in Swift nowadays, we get this feature
for free even in our "C++" apps, as we always link to CoreFoundation.

Our test binaries have been taught how to hook into this, so the
remaining step is to enable it via the SWIFT_BACKTRACE env var.

Change-Id: I72dbd9ea934ecc3091766456509f4bd42b2bdab8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit a8b2d9bcdc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-16 11:39:17 +00:00
Qt Submodule Update Bot
d0ead4f0a3 Update submodules on '6.9 in qt/qt5'
Change-Id: Iaa124ff3c7a1b742b809271ea1ef2a96db6978d5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-01-16 11:33:08 +00:00
Samuli Piippo
b07fbbf935 WoA: update template
WoA template got updated in 2151c5510f
and 0f18b0bc2f, but not everywhere.

Pick-to: 6.8
Change-Id: Ie2ee9e62f9bc10753bd527a2b1a7edc5de46ca60
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 69dfa0449c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-03 20:46:04 +00:00
Elias Toivola
0148e13038 Windows 11 23h2: Install Windows SDK 10.0.26100.1742
Change Windows 11 23h2 x86_64 tier-1 template -53 -> -54, where Windows SDK 10.0.26100.1742 is installed.

Task-number: QTQAINFRA-6862
Task-number: COIN-1206
Pick-to: 6.8
Change-Id: I713ea4d5032145a92d7bcbccec6c98543cbc90d2
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 4bfe8b9d71)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2025-01-03 13:21:59 +02:00
Elias Toivola
2c0ce8b3f2 Windows 10: Install Windows SDK 10.0.26100.1742
Change Windows 10 22h2 x86_64 tier-1 template -52 -> -53, where Windows
SDK 10.0.26100.1742 is installed.

Task-number: QTQAINFRA-6862
Task-number: COIN-1206
Pick-to: 6.8
Change-Id: Ia78f8d3b67c3aa546a4f47ad503f44782722631f
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 75578f016a)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2025-01-03 13:21:55 +02:00
Elias Toivola
91ba03e3b5 WoA: Install Windows SDK 10.0.26100.1742
Change Windows 22h2 arm64 tier-1 template -54 -> -55, where Windows
SDK 10.0.26100.1742 is installed.

Task-number: QTQAINFRA-6862
Task-number: COIN-1206
Pick-to: 6.8
Change-Id: Id4b008d12ee092daa1e84c50d9a36240ee680483
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 0f18b0bc2f)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2025-01-03 13:21:50 +02:00
Antti Kokko
d78024c6d5 Add missing documentation target for QtAA build
Task-number: QAA-2754
Change-Id: Icfd3bbeb94287e6e9a325af7785df173778044d9
Reviewed-by: Maija Metso <maija.metso@qt.io>
(cherry picked from commit e1f67cc3e6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-03 06:29:45 +00:00
Qt Submodule Update Bot
7b7a3ea702 Update submodules on '6.9 in qt/qt5'
Change-Id: Ia39a2917db36fee9685fca9c6ead25059407daf1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-01-02 22:54:41 +00:00
Johanna Äijälä
db53942a70 Provisioning: update Squish 8.1
Remove Squish provisioning from Debian11.6: Squish wont work
due GLIBC versiom mismatch.

Pick-to: 6.8
Pick-to: 6.8
Change-Id: I7bac15d585a87b402e41c9ab09099e2cabbd09d1
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
(cherry picked from commit 30a5af347f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-02 05:23:45 +00:00
Qt Submodule Update Bot
9bfbeb48d9 Update submodules on '6.9 in qt/qt5'
Change-Id: I6ec4a671624dc0189fa0ec4b56447b5e93dda99b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-31 02:44:27 +00:00
Tero Heikkinen
5e74968c61 Provisioning: Add missing Vulkan library to Windows on ARM
Fixes: QTQAINFRA-6830
Pick-to: 6.8
Change-Id: Ia074c55ddd20414f0d6b0dbcc674cc8eb82b1cf8
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io>
(cherry picked from commit e179279962)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-30 09:08:11 +00:00
Elias Toivola
d777fa2926 Android: update emulator version to 35.2.10
The newest stable version of Android emulator should bring more
stability.

Pick-to: 6.8 6.5
Fixes: QTQAINFRA-6805
Change-Id: Id67d3ec888b486e6aae862588928528788583aae
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 9078baf0a9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-30 09:08:03 +00:00
Qt Submodule Update Bot
34f15ccd11 Update submodules on '6.9 in qt/qt5'
Change-Id: I9121e04c3187d48dc380164b307be4eaeda6c7f8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-27 16:41:40 +00:00
Qt Submodule Update Bot
36aa81cb1b Update submodules on '6.9 in qt/qt5'
Change-Id: Ib25a71094f2b9237f118769791c355c289929c09
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-26 14:25:17 +00:00
Qt Submodule Update Bot
0e4d9053fc Update submodules on '6.9 in qt/qt5'
Change-Id: I452cd74e35d919c3f5394b7b58952635634642ff
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-25 11:04:26 +00:00
Qt Submodule Update Bot
3c2be7486c Update submodules on '6.9 in qt/qt5'
Change-Id: Ie3f875d78ded4fe66ac035a60687c9b3a61a3b4a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-24 13:45:27 +00:00
Qt Submodule Update Bot
42097ba59d Update submodules on '6.9 in qt/qt5'
Change-Id: I4e1d791a600518f12f8659736468287b89df947c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-23 20:16:23 +00:00
Alexandru Croitor
6db401beda coin: Switch ios-tests-on-macos to use qtci-macos-14-arm-106
This will use the newer iOS 17 SDK during the build, and allow us to
enforce the minimum SDK version check.

This change also switches to using an arm mac for the build.

Pick-to: 6.8
Task-number: QTBUG-119490
Change-Id: Ie9ff2b2f4fe40bda2856d4b12a03aaa05f836de4
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit f5970f9c62)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-22 13:35:42 +00:00
Oliver Wolff
51dec3728f README.md: Update minimal versions of Windows compilers
Pick-to: 6.8
Change-Id: Id743e89d0858fde4678b7ba4e848d780d19771fc
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
(cherry picked from commit 8319245b04)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-22 13:35:37 +00:00
Tero Heikkinen
b7abace894 Fix macOS ffmpeg ios parallel compiling to cause resource starvation
Add -j4 to limit how many cores is used to build ffmpeg-ios binaries.
Error in logs: "posix_spawn failed: Resource temporarily unavailable"

Task-number: QTQAINFRA-6803
Pick-to: 6.8
Change-Id: I3fb56cdbe4cbda8f779852b0a16121916aa5a1d4
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 6569f201c1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-22 13:35:33 +00:00
Alexandru Croitor
32d895a2a0 CMake: Raise CI-tested minimum CMake version to 3.22.6
Also change the upper case L to lower case l, because it's changed
upstream.

Amends 0cfa1fa561

Task-number: QTBUG-131169
Change-Id: I5e501e37bb5516e15a2cbb68cb523ebc5e88d47c
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
(cherry picked from commit ffef920337)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-22 13:35:29 +00:00
Tero Heikkinen
5ae41db586 Provisioning: Make Windows Path visible at the end of provisioning
There's possibility that some installations might add more into
Path that doesn't get visible during the installation process.

Change makes it easier to detect if there's i.e. JRE installed during
Mimer, which caused Java SE update to 17 fail in qtbase build for
Android, because JRE was the first Java found from Path and it
wasn't the required new JDK 17 version.

This can lead even to test with incorrect version of Java, which can
happen with any other different version installations as well.

Task-number: QTQAINFRA-6392
Task-number: QTQAINFRA-6385
Pick-to: 6.8
Change-Id: Idce79eb06d73894ae648e0be53ff1f07bb21392d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 444167f5fb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-22 13:35:25 +00:00
Elias Toivola
cfe773d749 Provisioning: Exit when an emscripten install command fails
If there is an error in emsdk scripts when running ".\emsdk install",
the provisioning would still continue. This change will make the script
exit and stop provisioning when the install command fails.

Also remove the attempt to use Python 2 and make sure the installation
finds Python 3 instead.

Pick-to: 6.8 6.5
Task-number: QTQAINFRA-5453
Change-Id: If052adcd446537b0eeb6261e4a297e9aeb292c6e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 879c8b91f3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-22 13:35:21 +00:00