summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on '6.4.2 in qt/qt5'6.4.2Qt Submodule Update Bot2022-12-151-0/+0
| | | | | Change-Id: I1909a0838ade6fd85f1216052c5a48aabe26f31b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.4.2 in qt/qt5'v6.4.2Qt Submodule Update Bot2022-12-1339-0/+0
| | | | | Change-Id: I10abdc1c14d015eb0802135be5b016cb7cad3ce3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.4.2 in qt/qt5'Qt Submodule Update Bot2022-12-0939-0/+0
| | | | | Change-Id: I7941af0a990770e4fa151e36e374913b2c09255b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.4.2 in qt/qt5'Qt Submodule Update Bot2022-12-0839-0/+0
| | | | | Change-Id: Ie441626f1bf7d900b9d96bf4c6d14f1eb4c23851 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.4.2 in qt/qt5'Qt Submodule Update Bot2022-12-068-0/+0
| | | | | Change-Id: I02b943e59ec15481d42ba1a4f56425fa08c245ad Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.4.2 in qt/qt5'Qt Submodule Update Bot2022-12-0539-0/+0
| | | | | Change-Id: I40b0d071fb8a29030bd64c55d4f8d97a662993b8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Adjust submodule branchesJani Heikkinen2022-12-021-38/+38
| | | | Change-Id: I0141e8e47bd1c2f0a80467366d07a30b74d2592a
* Update submodules on '6.4 in qt/qt5'Qt Submodule Update Bot2022-11-3030-0/+0
| | | | | Change-Id: If417eebf2e4c43ef564308f3f30a9a7f2753d869 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Update provisioned CMake to version 3.24.2Alexandru Croitor2022-11-295-13/+13
| | | | | | | | | | | | | | | | | | | | | | Needed to fix iOS Xcode generator builds when using Xcode 14. Otherwise compiler identification fails due to a code-signing error. We hit it in our iOS MinimalStaticTests configuration. error: Cannot code sign because the target does not have an Info.plist file and one is not being generated automatically. (in target 'CompilerIdCXX' from project 'CompilerIdCXX') See https://gitlab.kitware.com/cmake/cmake/-/issues/23719 Amends eee152ca704d501189905122a904255f581b3256 Fixes: QTQAINFRA-5044 Change-Id: Idabd78e6e28816a8fc4dd7e627de82f2c622c54e Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 6943f28b171f0d3a1d39bde55732948a23391219) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Add diffutils to msys2Artem Dyomin2022-11-281-1/+1
| | | | | | | | | cmp command is used by ffmpeg ./configure Change-Id: If80664d6c3318b7605c69d50e7606a1ec10840ea Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit 817a6d07f8a683d7d387d565bc6279f9d6c1be5f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Provisioning: Make bootstrap autostart run without terminalHeikki Halmet2022-11-277-0/+144
| | | | | | | | | | | | | | | | | | Terminal in UI might cause issues with Autotest This patch makes bootstrap-agent run in a background shell wrapper. The wrapper waits 20secs for the VM's network to come up and exits with an error if it doesn't. After that it waits for 20secs for the context image to be mounted. If no context image is mounted after that, it waits for one minute and makes one mounting attempt, before launching bootstrap-agent with or without context. Task-number: COIN-966 Change-Id: I9a3e490325d1fd7c0583b6d5db5eb2023e042571 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit fae885e9c16d3d14a1459e9adf782896e1ad3382) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Enable llvm-mingw ffmpeg windows buildArtem Dyomin2022-11-252-46/+80
| | | | | | | | | | | | | | | - Added build of ffmpeg for llvm-mingw - Improved build errors handling - Refactoring: decompose script into a few functions Build example: https://testresults.qt.io/coin/integration/qt/qt5/tasks/web_qt_qt5_1668780311363 See tests for LLVM-x64, they passed Change-Id: I59fe28ba6eb8e65ef5c4c3d08343ff72f349bd21 Reviewed-by: Lars Knoll <lars@knoll.priv.no> Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit 5ef8294f3f440be81d9d9e466517d8a7dce2b26d)
* Update submodules on '6.4 in qt/qt5'Qt Submodule Update Bot2022-11-2528-0/+0
| | | | | Change-Id: I41548ebaefca210688a5507cc1bbbdf15684729a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.4 in qt/qt5'Qt Submodule Update Bot2022-11-2239-0/+0
| | | | | Change-Id: I67f84848ca761aaf5830f65b46693478e3afa584 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.4 in qt/qt5'Qt Submodule Update Bot2022-11-1940-0/+0
| | | | | Change-Id: I10d726d965b6af2d76b891bd153e75282416256a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Provisioning: Update Xcode version to 14.1Heikki Halmet2022-11-186-13/+13
| | | | | | | | Command line tools are also updated Change-Id: Ic1d0882d395e014a4f33ed139c90800b3ba71cbf Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 20c8f11006154b9e241ca202bb3954f4aceed3d3)
* Provisioning: Disable application reopen after rebootSimo Fält2022-11-184-0/+61
| | | | | | | | | 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 c58560db14dab0911ec36bfc3dd8e39789294183)
* Add provisioning for ARM macOS 13 betaVille-Pekka Karhu2022-11-1846-1/+1157
| | | | | | | Task-number: QTQAINFRA-5066 Change-Id: I0ff36bea066b51e086b10b817769ca3f22190201 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit c310e9709706b14c408f5184cb8184faad72dd65)
* Fix ffmpeg build on windows CIArtem Dyomin2022-11-181-1/+1
| | | | | | | | | | | | | | | | | | 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 bc5662c0500cd9c3aa57b3d295a7d885ed09e3f1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Provisioning: Remove MSVC 2019 build tools updateHeikki Halmet2022-11-171-3/+5
| | | | | | | | | | | 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 2a7c08f591f613670fe2c4733992dd76230559c5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make macOS 13 Apple Silicon test significantTor Arne Vestbø2022-11-161-2/+2
| | | | | | | | Task-number: QTBUG-104210 Change-Id: Ib75931616718406d1dd8a2476f8566ef15257d4a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 7db5511fe6a9889bb4ab353df10189b8d8120aa6) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Add macOS 13 on Apple Silicon as insignificant platform (for now)Tor Arne Vestbø2022-11-151-0/+12
| | | | | | | | | | 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 2586e0f3bd07d1107e8762e0cf4902a0c12b06e1) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Update submodules on '6.4 in qt/qt5'Qt Submodule Update Bot2022-11-1239-0/+0
| | | | | Change-Id: I9ffd16dcb68b7bb5d8c1b996c9609831c5611e74 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* wasm: Add actual emscripten installation to path in coinDavid Skoland2022-11-091-4/+7
| | | | | | | | | | | | 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 4a6f43ed8d4abdd4e862a65aded02a8f000d7238) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add openSUSE LEAP 15.4 (KDE) to CIHeikki Halmet2022-11-0525-6/+668
| | | | | | | | | | | | 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 9c21dd75d264b349621ff2093dae36aeb2032161) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Qt6: Build wasm target binaries only onceJani Heikkinen2022-11-031-27/+1
| | | | | | | | | 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 a4db1a62b859ee194eda6e6c7956bcf795004715)
* Provisioning: Fix for checking the installed Android openssl versionHeikki Halmet2022-11-021-1/+1
| | | | | | | Change-Id: I2b180772da0e16aa69c7044eacc9c8ee617c6217 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 1a91aa20ac89d60f308bc6762e1de900f300a56c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Build static FFmpeg library on macOSPiotr Srebrny2022-11-0212-7/+141
| | | | | | | | | | | | | | | | | 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 51c663d171ce261e01d98e7c019460f6db0d220f) Reviewed-by: Lars Knoll <lars@knoll.priv.no>
* Provision FFmpeg library for QtMultimedia pluginPiotr Srebrny2022-11-0210-9/+221
| | | | | | | | | | 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 a273e9f11c8c0fdcd354b69ce7e113e4e0d45df9) Reviewed-by: Lars Knoll <lars@knoll.priv.no>
* Update submodules on '6.4 in qt/qt5'Qt Submodule Update Bot2022-11-0239-0/+0
| | | | | Change-Id: Ied862aad99691d5fc0655e45c3d55ff2242f9043 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Nightly builds: Add NON_QTBASE_TARGET_CMAKE_ARGS to qnx windows targetHeikki Halmet2022-11-011-0/+1
| | | | | | | | | | 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 c383d0fc91b9de00aca0c8e9216e53ee234ab662) Reviewed-by: Simo Fält <simo.falt@qt.io>
* Update LLVM MinGW to 15.0.0Tony Sarajärvi2022-10-303-20/+20
| | | | | | | | Task-number: QTQAINFRA-5214 Change-Id: I5ae09182dfbafdeaa8d23acf3d7c9cca0ca5f108 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit da78e8832df2304adb6312805a6cc6d2fa5995fb) Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Update submodules on '6.4 in qt/qt5'Qt Submodule Update Bot2022-10-2639-0/+0
| | | | | Change-Id: I8165809c56c7b5f3f86b835d48740c8fd9060024 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove qmake configuration option from qtsaferenderer.yamlTeemu Holappa2022-10-211-4/+4
| | | | | | | qmake options is not supported in 6.4. Change-Id: I421aebf8e67a19de4b9b6ae2b6addb5afaf004b7 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Make qtmultimedia depend optionally on qtquick3dPaul Olav Tvete2022-10-211-1/+1
| | | | | | | | | Needed for spatialaudioquick3d. Change-Id: I2bbfe1a23622deb90e7641b322ad9eac3ae4a112 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io> (cherry picked from commit 64a715e8bea2f1539ecd0f67856a7f9affbee11f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update build configuration to Ubuntu 20.04 in qtsaferenderer.yamlTeemu Holappa2022-10-211-1/+1
| | | | | | | | 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>
* Update submodules on '6.4 in qt/qt5'Qt Submodule Update Bot2022-10-2139-0/+0
| | | | | Change-Id: Ia5f76c86000658a5b389b3e5389866f21fcd8c36 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add platform configs for Qt Insight TrackerSamuli Piippo2022-10-201-0/+3
| | | | | | | Change-Id: I5818b94e0c3cc706ca87935b7292714c1313a641 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit d3857df3b207178b4ab97fcfd83c8189e29c4601) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.4 in qt/qt5'Qt Submodule Update Bot2022-10-1939-0/+0
| | | | | Change-Id: Ib9e7ec347375dd142f866ed9e86bde0660659614 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.4 in qt/qt5'Qt Submodule Update Bot2022-10-1839-0/+0
| | | | | Change-Id: Iccf5a1be4a245c6efaeb5b9fdeb21701ad0c2f6e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.4 in qt/qt5'Qt Submodule Update Bot2022-10-1739-0/+0
| | | | | Change-Id: Ic47ea2c06c74df2dce40303c05f37d7f7a45f5b1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update GHS compiler version to v2022.1.4Tatiana Borisova2022-10-151-2/+2
| | | | | | | | | - the latest patch_20196 (UTF-16 fix) is applied Change-Id: I0324c635b594f2a79604a36f962cca82e8a5de97 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 52d2df3a614ff40e31cca2c0e5d12649ca9881e0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.4 in qt/qt5'Qt Submodule Update Bot2022-10-1539-0/+0
| | | | | Change-Id: Icff651f7bcc1820b3a867dd100b361d5505933be Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove stray first line from provisioning scriptEdward Welbourne2022-10-141-1/+0
| | | | | | | | | 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 74fc1bcaec3e0f6954f9254c0ba48a31002dcc89) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Provisioning: update Squish 7.0.1Johanna Äijälä2022-10-142-22/+22
| | | | | | | | | 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 6754cb362a08cdb1a4a098bde9a6cde0f81c6c44) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update macOS11 (105) and macOS12 (105) templatesJohanna Äijälä2022-10-147-13/+13
| | | | | | | | | | 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 3e380e35b038405b4524cf704183e9b82348626e)
* Use updated macOS 12 tier1 image with AndroidHeikki Halmet2022-10-141-1/+1
| | | | | | | | | | | 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 d45c78212ac91af4c11974c6dd126e5252c0e476) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.4 in qt/qt5'Qt Submodule Update Bot2022-10-1339-0/+0
| | | | | Change-Id: I7f8d6649b6c7b21c11c2232b35a3d2bb2a9b5e6d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.4 in qt/qt5'Qt Submodule Update Bot2022-10-1139-0/+0
| | | | | Change-Id: I8cd8206872f39c32e16493cd868bdc22146a305f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.4 in qt/qt5'Qt Submodule Update Bot2022-10-0640-0/+0
| | | | | Change-Id: Ibdff4f1df0a980ee8accde8fca93bdf6d986bcce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>