Commit Graph

5663 Commits

Author SHA1 Message Date
Pavel Dubsky
bc854ea729 Update FFmpeg version to n7.0
Fixes: QTBUG-124482
Pick-to: 6.5
Change-Id: I69727981344d935151f19148960c711b65cb2307
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit eb8bbfe971)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit d4046310f8)
Reviewed-by: Liang Qi <liang.qi@qt.io>
2024-06-25 22:11:41 +02:00
Qt Submodule Update Bot
1c5205fa0d Update submodules on '6.7 in qt/qt5'
Change-Id: I90dec8c5c680aa5eebcc6b7a4371cbfb1b0a97b6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-25 03:05:20 +00:00
Qt Submodule Update Bot
ccff95d19f Update submodules on '6.7 in qt/qt5'
Change-Id: I286394323bd6e445c985b5f6e50c54b8a9c5b4c6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-21 18:24:32 +00:00
Qt Submodule Update Bot
2b3beb825d Update submodules on '6.7 in qt/qt5'
Change-Id: Icf4569d5e0eadaa3aaff0c2b181c606d71f50bdc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-20 20:13:47 +00:00
Qt Submodule Update Bot
d076c4a223 Update submodules on '6.7 in qt/qt5'
Change-Id: Id3082857a56d66f711c550e8eb1b93dd2663dcfb
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2024-06-17 12:45:16 +03:00
Jani Heikkinen
22c3205a62 Add packaging flag for windows on arm config for Qt 6.7
Change-Id: I7a288f66ea23e923b87baf0266cb577223acd433
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Aku Pietikäinen <aku.pietikainen@qt.io>
2024-06-06 11:26:52 +03:00
Jani Heikkinen
94456b0224 Drop unnecessary, duplicate builds from '6.7'
- We don't need to duplicate msvc2019 packaging build to windows 11;
it is already done and packaged from Windows 10 ->
drop windows-11_22h2-msvc2019, windows-11_23H2-msvc2019

- We have windows-11_23h2-msvc2022 and so on we don't need
windows-10_22h2-msvc2022 or windows-11_22h2-msvc2022

- We have windows-10_22h2-msvc2019-developer-build and so on we don't need windows-11_23h2-msvc2019-developer-build or windows-11_22h2-msvc2019-developer-build

- We have windows-10_22h2-msvc2019-arm64, which is used as a packaging target so we don't need windows-11_22h2-msvc2019-arm64 or windows-11_23H2-msvc2019-arm64

- We have windows-11_23h2-llvm, which is a packaging target so we don't need windows-10_22h2-llvm or windows-11_22h2-llvm

- We have windows-11_23H2-mingw11-developer-build and so on we don't need windows-10_22h2-mingw11-developer-build or windows-11_22h2-mingw11-developer-build

Change-Id: Ic406288fa989b1cb8d90c0d502dd93c166c2af14
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2024-06-06 08:26:46 +00:00
Qt Submodule Update Bot
6fb6701e49 Update submodules on '6.7 in qt/qt5'
Change-Id: I3d7d8d6aec35b1cdbd2c53fb9912ebaf5d8470be
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-03 16:52:23 +00:00
Qt Submodule Update Bot
c679d198f8 Update submodules on '6.7 in qt/qt5'
Change-Id: I83e96e1e57700da990fad376166a1f82b45e2998
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-01 03:23:08 +00:00
Qt Submodule Update Bot
57b34af69f Update submodules on '6.7 in qt/qt5'
Change-Id: I5c6c8da521e50ae0e92ff0e3a3ae89967fdddab5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-30 01:54:37 +00:00
Tero Heikkinen
72f11e0952 Provisioning: Add Windows 11 on ARM as non-blocking in CI
Visual Studio 2022 is the first msvc having natively support for
building and debugging ARM64 apps.

Provisioning needed to take new Get-CpuArchitecture
helpers.ps1 function into use in several installations.

Requirements for other branches
- Get-CpuArchitecture helpers.ps1 function
- Skip qtwebengine with Windows 11 ARM (QTBUG-124632)

List of excluded installations in Windows on ARM:

- Could be added later
  - MinGW - QTQAINFRA-6079
  - DirectX SDK for RTA
  - libclang
  - mcuexpresso
  - fbx for msvc2022
  - Ruby
  - For python
    - conan
    - emsdk

- Not supported yet
  - FFmpeg
  - Msys2 (for FFmpeg QTBUG-124399)
  - MySQL
  - PostgreSQL
  - Java JDK
  - Strawberry Perl

Task-number: QTQAINFRA-6111
Task-number: QTQAINFRA-6109
Task-number: QTQAINFRA-5855
Change-Id: I4130e78add53f8a6e05eb41b7617b3f9ca802178
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2024-05-29 12:40:59 +03:00
Oliver Wolff
0ef7ffd4ac Provisioning: Add Get-CpuArchitecture helper function
For the addition of ARM64 to our checked packages, this helper function
will come in handy as it is more fine grained than Is64BitHost.

Change-Id: I8956c1ca6e445c0b783a39e4d42069199496f053
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 8fae627f8b)
2024-05-29 12:40:56 +03:00
Qt Submodule Update Bot
d0a6a16338 Update submodules on '6.7 in qt/qt5'
Change-Id: I1b76a990ccd32230381a1c705ce1df00978f4512
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-27 03:16:42 +00:00
Eike Ziller
dd98a76d21 COIN/QtCreator: Remove Qt5 configuration
This isn't supported for a longer time now.

Pick-to: 6.6
Change-Id: Id10fb6c73459e5f10f854b417af6b14eec2e0f78
Reviewed-by: David Schulz <david.schulz@qt.io>
(cherry picked from commit 7bc8bfbf18)
2024-05-23 15:16:46 +02:00
Eike Ziller
c618f27a1a COIN/QtCreator: Add configuration for Windows without tests
Windows is most picky wrt exporting/symbol resolution,
so it is a good platform to do a build check without tests.

Pick-to: 6.6
Change-Id: I477e20f8c8bf16e1206082ae0c2b3960c902989a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
(cherry picked from commit dec2de7b82)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-05-23 12:30:03 +00:00
Marianne Yrjänä
e1e4227f0a Update QNX7.1 toolchain for CI
Pick-to: 6.5 6.2
Change-Id: I807fbfd468331a08b0672c4b2f02da1208470bf1
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 319cbd99c8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-05-22 13:33:32 +00:00
Qt Submodule Update Bot
3f00f38287 Update submodules on '6.7 in qt/qt5'
Change-Id: I7a901d003ad2afb6603f657c0562beae49ffe9ff
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-22 01:39:34 +00:00
Assam Boudjelthia
726e30183e Coin: update jdk from 11 to 17 to support Android builds with Gradle 8+
Gradle 8 and AGP 8+ require JDK version 17 to work properly, this is
needed for CI test runs of Android.

Task-number: QTBUG-106907
Change-Id: I437ee6752fe12ce4d40fbfe1af2bfff1b4ca243b
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 31d72b0e2c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-05-21 07:56:53 +00:00
Tero Heikkinen
5a11af1085 Provisioning: Remove Python2 from Windows provisioning
Python2 certificate failure blocks Windows provisioning.

Task-number: QTQAINFRA-6315
Pick-to: 6.5 6.2 5.15
Change-Id: I6f1e273d30e60fc4cbe872cdae2e52330bdb1ac7
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2024-05-20 07:27:28 +03:00
Heikki Halmet
e621d289ae Rhel 9.2 provisioning: Install xcb-util-cursor before updating repos
Task-number: QTQAINFRA-6325
Change-Id: I88b2dda373f3a85bdc10cb79576efc733460b4aa
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit ae82c1ab18)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-05-19 13:22:37 +00:00
Qt Submodule Update Bot
9de295cd89 Update submodules on '6.7 in qt/qt5'
Change-Id: Ieb15e9aee48f995fedca44133097a3e6034ea1aa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-15 05:27:40 +00:00
Dimitrios Apostolou
244e9bb4df Copy mdns resolution workaround to the emulated platforms too
Applies fix from commit 5c6814fb18
to the emulated platforms.

Fixes: QTBUG-107696
Pick-to: 6.5
Change-Id: I9c282ecf9c29c57cce964ae9962f1857c953cfd8
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit d25f25f3af)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-05-10 07:42:36 +00:00
Dimitrios Apostolou
a080533c2a Simplify command invocation
No need to wrap the sed call in a shell, just invoke sed directly.
And reduce the two separate sed invocations to one with two file arguments.

This change is purely aesthetic, functionality should be identical.

Pick-to: 6.5
Change-Id: If841301077e1c21fe846b28b5f7f6af422d86b93
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit 5f3586f59f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-05-10 07:42:29 +00:00
Alexey Edelev
a5533df262 Fix the typo in list(APPEND command
Amends 13a7e25f5d

Change-Id: I52f0990c1b956a8a1c9315e02114e429548bd2d2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit b1a9c94a19)
2024-05-08 11:25:42 +02:00
Alexey Edelev
aec2d4e2e1 Avoid collecting dependencies from modules that were explicitly skipped
If either -skip <module> or BUILD_<module>=OFF is set from command line
we should avoid processing the module dependencies and exclude it from
the list of modules that needs to be build.

Change-Id: Ieec8db085221cc4abd5d8ac83c06ecce25d5d4b0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 13a7e25f5d)
2024-05-08 11:25:39 +02:00
Qt Submodule Update Bot
ea47cf9278 Update submodules on '6.7 in qt/qt5'
Change-Id: Ib8c65b8768d017fe47cf2250c7f4f3e46672499d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-06 16:09:56 +00:00
Qt Submodule Update Bot
08e5f2bf12 Update submodules on '6.7 in qt/qt5'
Change-Id: I6c95e4ed8091dba8e96af81e9507b014bc4bca14
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-03 17:16:24 +00:00
Qt Submodule Update Bot
33931ac1fc Update submodules on '6.7 in qt/qt5'
Change-Id: I2bbb4bfc2fd635abf1672693b9a425779bb9e10a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-02 17:15:50 +00:00
Qt Submodule Update Bot
a0ec00aae4 Update submodules on '6.7 in qt/qt5'
Change-Id: I3f10f3869d3372dec5b6643bce1e3b1cf0b4ead0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-01 12:40:22 +00:00
Qt Submodule Update Bot
4f5e24a5f3 Update submodules on '6.7 in qt/qt5'
Change-Id: I9dee1d860e9cf45e606d889b5ed3687ddeaf9df9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-30 15:37:34 +00:00
Simo Fält
90937a8406 Provisioning: Fix openssl lib path on Debian
This amends change Ia4bacf1b7751e15915fc7faca473cb0408a72e35.

Task-number: QTBUG-123049
Change-Id: I0a3e24dd8157fd63c1bdfb06019faff2fa5ef3df
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 2ac1bddea4)
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit e6f58ce000)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-04-30 07:30:25 +03:00
Simo Fält
5c06f6e262 Provisioning: Install openssl3 into Debian VM
Task-number: QTBUG-123049
Change-Id: Ia4bacf1b7751e15915fc7faca473cb0408a72e35
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit e34e62b3b2)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2024-04-30 07:30:22 +03:00
Qt Submodule Update Bot
66b3871d19 Update submodules on '6.7 in qt/qt5'
Change-Id: I8afbbf89469fb26b69a86a1fd1f563bdca5a6c05
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-29 18:07:12 +00:00
Qt Submodule Update Bot
898bb43ce2 Update submodules on '6.7 in qt/qt5'
Change-Id: I5f49dc724c712b065810f030392cc93613e7e77e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-26 12:47:46 +00:00
Joerg Bornemann
419dac87ec CI: Turn off FEATURE_clangcpp for MSVC2022
This feature turns off clang-support for lupdate.

Task-number: QTBUG-123611
Task-number: QTQAINFRA-6244
Change-Id: I192b711b6a310e3dd1da3fefe2ca0c8fb732a01c
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit c8a236e858)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2024-04-26 12:47:44 +00:00
Elias Toivola
2d591bf518 Make Windows 11 23H2 targets blocking
This change removes 'InsignificantTests' feature from Windows 11 23H2
platform configurations.

Also add 'Packaging' to windows-11_23H2-msvc2022 target

Task-number: QTQAINFRA-6244
Task-number: QTQAINFRA-6075
Task-number: QTBUG-124244
Change-Id: I8ddb9dfa45199982511f46841d1be30757055b25
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit dc919e14d8)
2024-04-26 12:47:41 +00:00
Elias Toivola
59cb56a8b5 Add Windows 11 23H2 as non-blocking in CI
Windows 11 23H2 version which will replace Windows 11 22H2 once the
new version is deemed as stable. Until then, 23h2 tests will be set
as insignificant.

Task-number: QTQAINFRA-6075
Task-number: QTQAINFRA-6244
Change-Id: I15054813896210fadf14da815ad5a7b3e402e800
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 5157d1ef93)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2024-04-26 12:47:40 +00:00
Assam Boudjelthia
be3345b87e Coin:Android: bump minimum CI test emulator to Android 8 api 26
Qt 6.7 has the minimum supported Android version as 8, this applies
that to the CI as well.

Task-number: QTBUG-111919
Change-Id: Id4c9eda29f1b61bf739eae3624b07f44a893cfae
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 2d7f6760dd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-04-23 22:05:22 +00:00
Assam Boudjelthia
86fa22775f Android: remove unused Android 13 (api 33) system image download
Android 13 system image was still being downloaded and an emulator
created for it while it's not being used in CI, so it's just adds
unnecessary load to provisioning.

Change-Id: Ie33c82fd578dcfe68a77426c8e5c0cf047938833
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 3d69ad8d8a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-04-23 22:05:19 +00:00
Qt Submodule Update Bot
2496b860e6 Update submodules on '6.7 in qt/qt5'
Change-Id: Id77e8e75361ad1684a1c869d2dea459c5e101738
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-23 08:24:02 +00:00
Pavel Dubsky
58db36e43c Update provisioning script to build FFmpeg for Windows ARM64
Fixes: QTBUG-122745
Pick-to: 6.5
Change-Id: Ib03484ac89f07d7ad6433b0035769f4a9363495b
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit befe4a61d6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-04-21 19:01:32 +00:00
Tor Arne Vestbø
969309c09e Fix shellcheck warnings in set_tcc_permissions.sh
Change-Id: I6b4de6e02e92d4c85fbb58cb1573a0ab3a178b24
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 0a8f1050f9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-04-21 07:33:28 +00:00
Artem Dyomin
26a71457ae Implement dynamical ffmpeg linking on macOS
* fix dependencies and install names (absolute => relative)
* fix compilation build of dylib on xcode 15.
* add matching build instructions to yaml.
* old macos versions don't have 'realpath', workaround is used.

Task-number: QTBUG-120989
Pick-to: 6.6 6.5
Change-Id: I22e413d8f6d05c8c7d6d09a5926691216e781fd3
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit a53b63019f)
2024-04-20 08:39:40 +02:00
Assam Boudjelthia
82382f5c69 Android:Coin: do gradle build in provisioning to cache downloadables
If Gradle is not present in the system, it's downloaded from the URL
from the Gradle wrapper. Also, the same for AGP when an Android
project build is done. Currently, that's done on every integration,
and that can be unreliable due to networking flakiness. With this
patch, a Gradle build is done once during provisioning where the
downloads of Gradle and AGP dependencies are downloaded.

Fixes: QTQAINFRA-6166
Fixes: QTQAINFRA-4726
Fixes: QTBUG-117203
Fixes: QTBUG-114699
Change-Id: Ic9fd8aeea3379ca1d45ffeb4523a52e2846fcabb
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 39517ef0d0)
2024-04-18 06:51:03 +00:00
Qt Submodule Update Bot
2366d4f29e Update submodules on '6.7 in qt/qt5'
Change-Id: Ie7f6492a121a7624081839efeb5228b95adaa343
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-11 16:50:38 +00:00
Robert Löhning
76f10dbcc8 README.md: Update MinGW requirement
Change-Id: I931202f00592d5fc6411fa2d8a7825c5b9117c4e
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
(cherry picked from commit 6941e50a6d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-04-08 16:44:34 +00:00
Allan Sandfeld Jensen
3d9ea708bf Add gbm dependencies for webengine to RHEL
Was previously only added for 8.4 and 9.0

Pick-to: 6.5
Change-Id: Ifa22b6836818ad59b6f3dcfd6b1a6dbc1293782b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit ee56a3b8ae)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-04-06 21:54:46 +00:00
Assam Boudjelthia
715e9f618d Coin:Android: update emulator version to 34.1.19
Update to latest (as of now) Android emulator version 34.1.19, which
might solve Vulkan crashes on some CI tests.

Pick-to: 6.6 6.5
Task-number: QTQAINFRA-5971
Change-Id: Ic81158f44ac5c922bfdbe6f5c04900234e063615
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit a9f16c0abd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-04-05 18:02:03 +00:00
Qt Submodule Update Bot
6b5bbaac15 Update submodules on '6.7 in qt/qt5'
Change-Id: Ie7e1e53c1b02727c7542f9f75d79ead0b3a3d133
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-05 00:49:30 +00:00
Qt Submodule Update Bot
fb9718eaa9 Update submodules on '6.7 in qt/qt5'
Change-Id: I839ae55ee8bae32b4429aece578f21ede4998bb3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-03 19:54:31 +00:00