Commit Graph

5143 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
923ae4e64f Update submodules on '6.4 in qt/qt5'
Change-Id: I67f84848ca761aaf5830f65b46693478e3afa584
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-22 12:49:03 +00:00
Qt Submodule Update Bot
730c290f53 Update submodules on '6.4 in qt/qt5'
Change-Id: I10d726d965b6af2d76b891bd153e75282416256a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-19 09:57:08 +00:00
Heikki Halmet
6e94f4eaf0 Provisioning: Update Xcode version to 14.1
Command line tools are also updated

Change-Id: Ic1d0882d395e014a4f33ed139c90800b3ba71cbf
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 20c8f11006)
2022-11-18 19:01:19 +00:00
Simo Fält
240b203917 Provisioning: Disable application reopen after reboot
This is required with physical Mac machines.

Task-number: QTQAINFRA-5094
Change-Id: Ic1fad436d76d04e1dbce778f57bb69d8124548e7
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit c58560db14)
2022-11-18 19:01:19 +00:00
Ville-Pekka Karhu
a0c057c160 Add provisioning for ARM macOS 13 beta
Task-number: QTQAINFRA-5066
Change-Id: I0ff36bea066b51e086b10b817769ca3f22190201
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit c310e97097)
2022-11-18 19:01:19 +00:00
Artem Dyomin
4772efbe48 Fix ffmpeg build on windows CI
Ffmpeg was not compiled because of failed yasm installation
on msys2. The installation failed due to checking pgp signatures.
Current fix adds keys refreshing that fixes the problem (checked
on CI and on local machine)

Note, currently the ffmpeg build works with msvc and mingw,
additional settings for llvm should be added in next commits.

Build example:
https://testresults.qt.io/coin/integration/qt/qtmultimedia/tasks/web_qt_qtmultimedia_1667916985085

Change-Id: Iff305e896bfb382c0c4030235cc2ad942cbbc002
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit bc5662c050)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-18 08:28:42 +00:00
Heikki Halmet
d473e0ef63 Provisioning: Remove MSVC 2019 build tools update
Running vsinstaller twice seems to cause problems. Second installation
get stuck and it can't be used again. Seems like somethin get corrupted.

Task-number: QTQAINFRA-5090
Change-Id: Ic638879ea2f70bc74c028bff24daceb50e98480d
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
(cherry picked from commit 2a7c08f591)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-17 15:44:41 +00:00
Tor Arne Vestbø
5f8c0b220c Make macOS 13 Apple Silicon test significant
Task-number: QTBUG-104210
Change-Id: Ib75931616718406d1dd8a2476f8566ef15257d4a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 7db5511fe6)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-11-16 21:30:15 +00:00
Tor Arne Vestbø
610eb94b82 Add macOS 13 on Apple Silicon as insignificant platform (for now)
Task-number: QTBUG-104210
Change-Id: Ic9f6a1b0a93e762a643fb98d31d1a3b82bdd61ea
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 2586e0f3bd)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-11-15 12:33:35 +00:00
Qt Submodule Update Bot
9c8208de5f Update submodules on '6.4 in qt/qt5'
Change-Id: I9ffd16dcb68b7bb5d8c1b996c9609831c5611e74
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-12 04:56:44 +00:00
David Skoland
9fc871298c wasm: Add actual emscripten installation to path in coin
I'm not sure where the emscripten-$version came from, maybe that's
how it used to be? In any case, in the current version (3.1.x),
the installation folder is in upstream/emscripten, so add PATH
there to access all emscripten utils.

Change-Id: I648feae21bc5caecc3f0bf0a7d16238680a85590
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
(cherry picked from commit 4a6f43ed8d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-09 06:53:59 +00:00
Heikki Halmet
43a8ea3bbd Add openSUSE LEAP 15.4 (KDE) to CI
Graphichs Platform: X11 (System default) in image with suffix 50
Graphics Platform: Wayland (Plasma (Wayland) in image with suffix 51

Task-number: QTQAINFRA-5049
Change-Id: If4b208bc12bd272c757aac61ffc9ef7a88df8f7c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 9c21dd75d2)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-11-05 11:52:04 +00:00
Jani Heikkinen
5f48df25c0 Qt6: Build wasm target binaries only once
Wasm will be built only in linux and those same binaries will be used also
in macOS and Windows.

Change-Id: If94098df624ab718491b9407c456d75ce7c7b117
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit a4db1a62b8)
2022-11-03 11:29:59 +00:00
Heikki Halmet
fd4187cc09 Provisioning: Fix for checking the installed Android openssl version
Change-Id: I2b180772da0e16aa69c7044eacc9c8ee617c6217
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 1a91aa20ac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-02 19:34:11 +00:00
Piotr Srebrny
2217500031 Build static FFmpeg library on macOS
This patch modifies linux/ffmpeg-install.sh to work also for macOS.
The FFmpeg libraries are installed under /usr/local both for Linux
and macOS.

Since macOS x64 does not have the lzma lib for arm64 architecture
installed by default, I disable this libraries for FFmpeg. This
only affects the TIFF image decoder that we do not use.

Added the execute permission to the ubuntu scripts.

Change-Id: Ib8623c6a9bcdd24c89045ede0494839fb9cd2ecc
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 51c663d171)
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2022-11-02 16:52:29 +02:00
Piotr Srebrny
d7984542a2 Provision FFmpeg library for QtMultimedia plugin
One of the QtMultimedia backends is implemented using FFmpeg.
This provisioning enables building and testing of this backend.

Change-Id: Ia196c2ae4b457aa6b8e3ee8e0f367197aadfe0d9
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit a273e9f11c)
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2022-11-02 16:52:27 +02:00
Qt Submodule Update Bot
f3a7ef45f9 Update submodules on '6.4 in qt/qt5'
Change-Id: Ied862aad99691d5fc0655e45c3d55ff2242f9043
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-02 00:23:59 +00:00
Heikki Halmet
a74ce90f2d Nightly builds: Add NON_QTBASE_TARGET_CMAKE_ARGS to qnx windows target
Other modules don't include needed flags

Change-Id: Id4525fa9887afff2ee6baed64f217167f545a2f5
Reviewed-by: Tommi Mänttäri <tommi.manttari@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit c383d0fc91)
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-11-01 08:31:11 +00:00
Tony Sarajärvi
9b15868ce5 Update LLVM MinGW to 15.0.0
Task-number: QTQAINFRA-5214
Change-Id: I5ae09182dfbafdeaa8d23acf3d7c9cca0ca5f108
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit da78e8832d)
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-10-30 19:15:10 +03:00
Qt Submodule Update Bot
97e64cd225 Update submodules on '6.4 in qt/qt5'
Change-Id: I8165809c56c7b5f3f86b835d48740c8fd9060024
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-26 17:28:42 +00:00
Teemu Holappa
b0a2759c5e Remove qmake configuration option from qtsaferenderer.yaml
qmake options is not supported in 6.4.

Change-Id: I421aebf8e67a19de4b9b6ae2b6addb5afaf004b7
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2022-10-21 17:40:43 +03:00
Paul Olav Tvete
5f588f7f5b Make qtmultimedia depend optionally on qtquick3d
Needed for spatialaudioquick3d.

Change-Id: I2bbfe1a23622deb90e7641b322ad9eac3ae4a112
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
(cherry picked from commit 64a715e8be)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-21 10:50:00 +00:00
Teemu Holappa
52e3f29867 Update build configuration to Ubuntu 20.04 in qtsaferenderer.yaml
Ubuntu 18.04 is not supported in 6.4 branch. In this commit.
the machine template is changed from 18.04 to 20.04.

Change-Id: I286176dd2b2fd3cbc13821882e411c227eb8d360
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
2022-10-21 10:42:47 +03:00
Qt Submodule Update Bot
f2068ba5d6 Update submodules on '6.4 in qt/qt5'
Change-Id: Ia5f76c86000658a5b389b3e5389866f21fcd8c36
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-21 02:13:04 +00:00
Samuli Piippo
be94e8efff Add platform configs for Qt Insight Tracker
Change-Id: I5818b94e0c3cc706ca87935b7292714c1313a641
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit d3857df3b2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-20 05:37:42 +00:00
Qt Submodule Update Bot
8ba49dc7b5 Update submodules on '6.4 in qt/qt5'
Change-Id: Ib9e7ec347375dd142f866ed9e86bde0660659614
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-19 12:41:33 +00:00
Qt Submodule Update Bot
6b8bda0f01 Update submodules on '6.4 in qt/qt5'
Change-Id: Iccf5a1be4a245c6efaeb5b9fdeb21701ad0c2f6e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-18 22:18:12 +00:00
Qt Submodule Update Bot
cfe88ecea6 Update submodules on '6.4 in qt/qt5'
Change-Id: Ic47ea2c06c74df2dce40303c05f37d7f7a45f5b1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-17 15:27:07 +00:00
Tatiana Borisova
1190025855 Update GHS compiler version to v2022.1.4
- the latest patch_20196 (UTF-16 fix) is applied

Change-Id: I0324c635b594f2a79604a36f962cca82e8a5de97
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 52d2df3a61)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-15 10:29:22 +00:00
Qt Submodule Update Bot
d533c5593b Update submodules on '6.4 in qt/qt5'
Change-Id: Icff651f7bcc1820b3a867dd100b361d5505933be
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-15 02:12:37 +00:00
Edward Welbourne
0240b3a5de Remove stray first line from provisioning script
Having a blank line before the shbang makes the shbang not work.

Change-Id: I523c4eab8746da2b898eacf3f54f73d63dbd2786
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 74fc1bcaec)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-14 15:22:00 +00:00
Johanna Äijälä
c1fc588ae7 Provisioning: update Squish 7.0.1
Update Squish to 7.0.1, include versions with Qt6.3 and 6.2 support.

Change-Id: I2bd7cd51a41befdbf2ef242eb72c2c2add84f733
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 6754cb362a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-14 15:16:41 +03:00
Johanna Äijälä
7776bb2577 Update macOS11 (105) and macOS12 (105) templates
Use templates which have Accessibility enabled for
Squish.

Task-number: QTQAINFRA-3559
Change-Id: I9538ea48791ea81738a41b1e101552cfc3bd454b
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit 3e380e35b0)
2022-10-14 15:16:40 +03:00
Heikki Halmet
49d893fd9e Use updated macOS 12 tier1 image with Android
Use templates which have Accessibility enabled for Squish.

Task-number: QTQAINFRA-3559
Change-Id: If3c1a68a475149efdeb3bfd19efd6edaea411167
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit d45c78212a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-14 12:16:39 +00:00
Qt Submodule Update Bot
36360821b3 Update submodules on '6.4 in qt/qt5'
Change-Id: I7f8d6649b6c7b21c11c2232b35a3d2bb2a9b5e6d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-13 19:21:18 +00:00
Qt Submodule Update Bot
635010527c Update submodules on '6.4 in qt/qt5'
Change-Id: I8cd8206872f39c32e16493cd868bdc22146a305f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-11 23:23:48 +00:00
Qt Submodule Update Bot
e29db34952 Update submodules on '6.4 in qt/qt5'
Change-Id: Ibdff4f1df0a980ee8accde8fca93bdf6d986bcce
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-06 19:38:10 +00:00
Qt Submodule Update Bot
76c5f99be2 Update submodules on '6.4 in qt/qt5'
Change-Id: I554589d98fb896658c61bc24d87984244fa174be
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-04 03:19:48 +00:00
Qt Submodule Update Bot
835cf41264 Update submodules on '6.4 in qt/qt5'
Change-Id: I93b26a7acf8a8de4f4d10f5a8fe206393429b63f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-30 17:58:52 +00:00
Qt Submodule Update Bot
ebcdf06e03 Update submodules on '6.4 in qt/qt5'
Change-Id: I203910986338cbb6c71f1abd6550dcac5a6bf156
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-29 18:27:46 +00:00
Volker Hilsheimer
094da4d84c Remove unique Android configuration from qtdeclarative.yml
The configuration is not used to test qtbase, so dependency updates
might fail if changes already in qtbase do not pass when then updating
dependencies of qtdeclarative.

This happens right now in
https://testresults.qt.io/coin/integration/qt/qtdeclarative/tasks/1677711115

If we want to enable this configuration anywhere we need to add it to
qtbase, or ideally the default list of platforms in cmake_platforms.yaml.

Change-Id: I3f5614d34def41caf1747a5f8094bac3aa2d9e2b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 905a2a9571)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-29 18:02:29 +00:00
Qt Submodule Update Bot
6e6c314bf2 Update submodules on '6.4 in qt/qt5'
Change-Id: I298d1641fafd439a101f6625b3af36c032101ebc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-28 22:50:38 +00:00
Assam Boudjelthia
642e35c7ef Coin: Fix includes in tqtc-android-automotive configuration
This broke after 8899244b8c which
unified the Android targets into one config file.

Change-Id: I9b24973ddf716f97e72d152387365c35405e0502
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 9e9f3e513b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-28 14:34:07 +00:00
Jani Heikkinen
3ed0d26425 Build android target binaries only once
- android armv7 is build only in windows
- android arm64 is build only in mac
- android x86 and android x86_64 are build only in linux

Task-number: QTBUG-101357
Change-Id: Ibfbd2e3c6d5d3a7a52dde3b35ca6c23eddf4b2f1
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 8899244b8c)
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-09-27 13:17:06 +03:00
Toni Saario
45749d90d5 Precheck: Fix macos android include
This broke after 8899244b8c.

Change-Id: I5cfdb2e94c8b170faba52631d9ee52cdcf7e0b36
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 5e24ed72b0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-27 10:17:05 +00:00
Qt Submodule Update Bot
c9a584a6ae Update submodules on '6.4 in qt/qt5'
Change-Id: If3d82b9510d78730fdbf7a3580d46bf760150dea
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-27 10:17:03 +00:00
Heikki Halmet
610f5b6270 Update Git version
We need newer ssh for RTA use. Current version has problem with
ConnectTimeout:
https://github.com/PowerShell/Win32-OpenSSH/issues/1352
Latest git version comes with OpenSSH version 9.0p1 from which this
should be fixed.

Task-number: QTQAINFRA-5038
Change-Id: I5aac1db22b1145163ee947537b363a94b86d094d
Reviewed-by: Timo Lahti <timo.lahti@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 825736dd7a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-26 14:04:05 +00:00
Johanna Äijälä
7f055aa083 Provisioning: Add Java 11 to Ubuntu20.04
Needed by RTA when compiling Android applications, minimum required
Java is 11.

Change-Id: I9a64e8de322a576d5d94593b5666d72afea8744f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit db68763094)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-26 14:04:03 +00:00
Heikki Halmet
4197afe58b Support multiple Android NDK versions
We need to verify latest Android NDK version in all
Qt6 branches and we need to retain the NDK version we
had when the specific branch was released at the first time.

Verification of the latest NDK will be done during integrations
in 'dev' branch and with older brances it will be done using
nightly build targets

Task-number: QTQAINFRA-4990
Change-Id: I2a96e419d403820f55f4244230c28ad09dc9095b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 8a72b1de99)
2022-09-23 07:23:52 +03:00
Toni Saario
2caf376cd1 Run bic tests
The way of running bic tests has changed. Now tests need to be run on
qt5 level where all modules are present and intermodule includes can
be handled.

Task-number: QTBUG-100698
Change-Id: Ic68c019988718485201602f279530c501f6e6ba3
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-09-22 09:46:16 +00:00