aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove dummy test instructions6.3Toni Saario2022-09-221-4/+1
| | | | | | | | | These cause Coin to spawn VM for setting one env variable. Change-Id: Ie782edc11382dace7a22ac16b1c58a2e9d26905f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 2056362e2678f5de220665b8053579760720b72e) Reviewed-by: Simo Fält <simo.falt@qt.io>
* CI: Use TCP protocol by default when mounting on QNX qemuPasi Petäjäjärvi2022-09-081-1/+1
| | | | | | | | | | | | | Ubuntu 22.04 has entirely disabled using UDP protocol for NFS mounting support and QNX mount command uses that by default. https: //discourse.ubuntu.com/t/jammy-jellyfish-release-notes/24668 Fixes: QTBUG-104229 Change-Id: I9457153ca524009bc7358346a873b8842a65c50a Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 08ba3ff8827277df17a4f6985066d38853fa076a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* coin: Install local Homebrew formulas explicitly as formulaTor Arne Vestbø2022-08-292-2/+2
| | | | | | | | | | | | | Otherwise we end up with scary warnings like: Error: Failed to load cask: ./coin/provisioning/common/macos/libiodbc.rb Cask 'libiodbc' is unreadable: wrong constant name #<Class:0x00007fb4f589d2d8> Warning: Treating ./coin/provisioning/common/macos/libiodbc.rb as a formula. Change-Id: Ief1b78c70367c740ce7eeca9110c3cf41372f53a Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit d3867057b95364b5e88a761f3c38e5ac96c6c2f5) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Coin: Add Android OpenSSL scripts to macOS 12 provisioning targetAssam Boudjelthia2022-08-292-0/+88
| | | | | | | | Fixes: QTBUG-105594 Change-Id: I4980f27e216c627c1675d04ed1bb5f5b9d62f2c0 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 8cc7a5f45000f20a0af44004bd65222b04e3ee4e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Exclude timezone functionality from INTEGRITY buildTatiana Borisova2022-08-271-1/+1
| | | | | | | | | | - Device doesn't support full functionality Change-Id: Ie0293e9d1ec9c5500e2c63e0c7ff8cc32015a454 Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 41f0e6d7b0fc71ed7bd7e2e99a52fe4d0b3e8fb4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update Xcode version to 13.2.1 for macOS 11Heikki Halmet2022-08-272-4/+4
| | | | | | | | | | This is needed for QTQAINFRA-5109 Task-number: QTQAINFRA-5109 Change-Id: I49dafa26ef2aafe6e1c9f9cab87486675283c305 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit d4602891f292926ae60a6de8ce0fdbf4fab4946d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Include needed Platform dependency for nightly QNX_710 windows targetHeikki Halmet2022-08-261-0/+5
| | | | | | Change-Id: I753245ae5641a45286c394cfb2696da6796d664d Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 5af40232de640c27e18f218cd06a5514885bd9d1)
* CI Nightly: add Windows host support for QNXTommi Mänttäri2022-08-257-3/+110
| | | | | | | | | | | Add required configurations to Nightly run for building Qt SW in Windows host for QNX OS. Task-number: QTBUG-101292 Change-Id: I689abd6596bf1ab1f30ba07c198e12569dbf2164 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 857ae6e1e161e85d3d7402901dc67b33d3e65d65) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.3 in qt/qt5'Qt Submodule Update Bot2022-08-2436-0/+0
| | | | | Change-Id: Ifac85de99bae56ecbe05385ac4d2dda1bff90350 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.3 in qt/qt5'Qt Submodule Update Bot2022-08-2236-0/+0
| | | | | Change-Id: Id1ccf4fac9c3884f1816cbcea72d802939ff1269 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CI: Make QNX 710 x86_64 significantPasi Petäjäjärvi2022-08-221-1/+1
| | | | | | | Task-number: QTQAINFRA-4838 Change-Id: Ib75847afdf6ec4dea32f6b232f53768d2d5df2f9 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit b42e533a6f9c061e0ece5bf98ab10493f70673a3)
* Fix rmt client setup to repo-clonesHeikki Halmet2022-08-221-1/+1
| | | | | | Change-Id: I36d8f24b19135345a2829e7521585c0cba9fc41f Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit f7947969847b6a5872d2d8acc36a6425e2c08438)
* Update submodules on '6.3 in qt/qt5'Qt Submodule Update Bot2022-08-2036-0/+0
| | | | | Change-Id: I69b249963a24f6c53311fe7111e2e9deeb5f6193 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Provisioning: Update MSVC 2019 version to 16.11.18 in Tier 1Heikki Halmet2022-08-171-6/+6
| | | | | | | | | | | | | Older version seems to have issues with installer when updating the visual studio and buildtools versions through installer via command line. Task-number: QTQAINFRA-5090 Change-Id: Iaec5391ed7bc9780374a7f971624522dae2feee6 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 0507008ff656f2989e9649293c49b76880bd9406) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QNX: generate wrapper scripts for all hostsSamuli Piippo2022-08-161-3/+3
| | | | | | | | | The QNX build done on linux host can be used in installer for all host, make sure that the wrapper scripts are also available for all hosts. Change-Id: I564b66682cdfd514e165dfb1542683e9a542a53d Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> (cherry picked from commit 4ec187cd4cbb297ac309e913412b4988196e9196)
* Add wrapper for sccache command in Linux and macOSSimo Fält2022-08-122-0/+21
| | | | | | | | | | | The sccache tends to fail every now and then. Adding a wrapper which calls build tools directly if first call with sccacche fails. Task-number: COIN-740 Change-Id: Ic03cf991da585d1569387118183763497ea73b72 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit e8495fc86e81f79aac5837b261e8395133c13631) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Provisioning: Remove git installation from macOS 10.14Simo Fält2022-08-121-6/+0
| | | | | | | | | | | | | The script uses homebrew which does not support 10.14 anymore and it fails. The git was installed due to Conan, but with TestOnly config it does not need git. Task-number: QTBUG-105554 Change-Id: I542780d32ebd7054c75a6afa357b3fac898b93cb Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit a992ba92052844fbe479a6739f6be609ebfbae39) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.3 in qt/qt5'Qt Submodule Update Bot2022-08-1136-0/+0
| | | | | Change-Id: I0b3fb316a96c796e16c15cfbce928badd9657efb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.3 in qt/qt5'Qt Submodule Update Bot2022-08-1037-0/+0
| | | | | Change-Id: Ice6dc826a034b0c30bffb5abdc20f2c6717b8fd5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use macOS version from the packaging rules to build QtAlexey Edelev2022-08-052-5/+5
| | | | | | | | | | | Use macOS 12 as the building platform for Qt. macOS 10.14 will be deprecated as the building platform in Qt 6.5. Change-Id: I14d850a489efced84aa1e7e294d2ae75f5efa3de Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit c0ecadc049a89308762450cb3e7297e18fab5716) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* coin: Build and test iOS on macOS 12Tor Arne Vestbø2022-08-052-2/+2
| | | | | | | | | Ensures a recent Xcode version is used. Change-Id: I15b82417d336af3ea9ad385bd6d1f4e08d64c6c0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 860bd111e271a6327455cf65a3bc6963df4b8780) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.3 in qt/qt5'Qt Submodule Update Bot2022-08-0336-0/+0
| | | | | Change-Id: I9a5a7e06c51e8ea262d721d9bb62eae95750f3d7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.3 in qt/qt5'Qt Submodule Update Bot2022-07-2636-0/+0
| | | | | Change-Id: I2590d53324c5bbb6b0ad7f880bf0b5694ef27796 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* COIN: Replace macos-12-arm64-tests with x86_64 in default precheckSimo Fält2022-07-211-1/+1
| | | | | | | | | | | There is a shortage of arm based Mac machines in CI so we have to spare the resources for now. Change-Id: Ifda8d6fb5ef3224dd001c6bdf2cf2cd14b8cff8a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit b830beb222877b5712b93f8e2bf90fba85a40bba) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Harden cache delete script and extend to all Linux CI platformsAxel Spoerl2022-07-218-12/+362
| | | | | | | | | | | | Log script activities and deleted toplevel cache files/directories. Use sudo to override permissions in cache. Remove legacy single file based cache if it exists by error. Create cache directory with appropriate permissions if missing. Change-Id: Id6ad930bf8ba9233eeea8a7602d25c98d0058409 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit aa9095d4cd235918118f6ec8f524806e3510e6ca) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.3 in qt/qt5'Qt Submodule Update Bot2022-07-2136-0/+0
| | | | | Change-Id: I8f3b052e83e2b7045b5bf34ba8c9b3cc895c467f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Implement cache cleanup script for openSuSEAxel Spoerl2022-07-201-0/+54
| | | | | | | | | | | | Provisioning openSuSE VMs with a populated /home/qt.cache creates flaky crashes of plasmashell during KDE/Plasma startup. This scrip wipes the directory at the end of provisioning Fixes: COIN-897 Change-Id: If61f86843e7b81dfee85610b1cd73bb15ce26658 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit aa6a82d99042aada76f9e38a58e92d6f19ca5fb5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Coin:Android: Use VMSize8 for Android test targetsAssam Boudjelthia2022-07-192-2/+2
| | | | | | | | | | | | Ensure to explicitly use 8 cores for Android targets runnining tests to reduce the amount of flaky fails due to the emulator crashing or freezing. Task-number: COIN-896 Change-Id: I8b0cfac34aa7fc416166b9f7ae0b3e9d72c62e55 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 39efd3c35fd6713104d7cc2f47567010485cdae5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.3 in qt/qt5'Qt Submodule Update Bot2022-07-1936-0/+0
| | | | | Change-Id: I55fba08167613996b12070b2423ac865d7df0de8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.3 in qt/qt5'Qt Submodule Update Bot2022-07-1536-0/+0
| | | | | Change-Id: I9285b98ae040fa30fcaa234a39e67807bacb0c03 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use 4 CPU cores for tqtc-android-automotive test VMAssam Boudjelthia2022-07-151-1/+1
| | | | | | | | | | The current cores count is 2 and that's leading to failures in tests execution. Change-Id: Ia442c66f0c6246114f43f812240ad469dc705424 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> (cherry picked from commit dcc3d699fbb0f5fdb44d197754d28459d78b52f1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Coin:Android: Enable tests for default packaging target - Part 5Assam Boudjelthia2022-07-1231-119/+31
| | | | | | | | | | | | | | | | | | | This makes sure Android tests are run by default for packaging targets for various integrations including qt5 integrations and potential issues are caught up early on especially when doing sumobules updates and coin scripts updates. Also, this makes it easier to manage instead of having the tests enabled per module. Thus, this removes the Android test include from the individual modules because it will be retrieved directly from cmake_platforms_target_android_host_linux.yaml which is included by cmake_platforms.yaml. Task-number: QTBUG-88846 Change-Id: I8bc1638df48ad27781160df943c0126ffe495a3e Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 1d4f821520263c68dc4c429ac9c52750c41aae59) Reviewed-by: Simo Fält <simo.falt@qt.io>
* Update submodules on '6.3 in qt/qt5'Qt Submodule Update Bot2022-07-1236-0/+0
| | | | | Change-Id: I9760f27b75d076b1853ce7a47d263b1fd496ee8f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "Change QNX temporarily insignificant"Jukka Jokiniva2022-07-061-3/+3
| | | | | | | | | | This reverts commit 60cb5adc2ebadd411ad312e3e49af40ca7f56d6d. Reason for revert: QNX licenses fixed Change-Id: I50bdff9b416c10d0a9181cded524c37681a8723e Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit 9aa0ec5040079b43f7b694625bb5422b8d420600)
* Update submodules on '6.3 in qt/qt5'Qt Submodule Update Bot2022-07-0637-0/+0
| | | | | Change-Id: I1505581b81d56efbd06a154d417e18e834616b7a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Change QNX temporarily insignificantJukka Jokiniva2022-07-041-3/+3
| | | | | | | | | | QNX licenses expired. Temporarily remove QNX from blocking CI. Change-Id: I96f9b2d4c07c1921736c929971ec1e716d7d6131 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> (cherry picked from commit 60cb5adc2ebadd411ad312e3e49af40ca7f56d6d) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* COIN/Qt Creator: Run testsEike Ziller2022-06-291-4/+4
| | | | | | | Change-Id: I73247d88fcd5539c2d3748af7619c2223c237d9c Reviewed-by: Antti Kokko <antti.kokko@qt.io> (cherry picked from commit 58ebc955614f8d96eac54c0953b9b4071bf1a0ef) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.3 in qt/qt5'Qt Submodule Update Bot2022-06-2236-0/+0
| | | | | Change-Id: I8abf0ae9f9ba606d3582f2fd02668569ad388fee Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.3 in qt/qt5'Qt Submodule Update Bot2022-06-1837-0/+0
| | | | | Change-Id: I460d776f7d69d2de09372459ad390dd1bb67c1a6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Precheck: Run only configs used in cmake_platforms.yamlToni Saario2022-06-161-6/+0
| | | | | | | | | | | | Most of the modules do not have all configurations from different yamls. Using configs from yamls only used in some modules will lead to precheck using configs which are not used on normal integrations. Change-Id: I7712db05eee485692d0363326194f02e21a40b9a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit e9b5cfc63462ecebfff6ae0c12596d2d66ed02b0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Take custom libdir into accountJoerg Bornemann2022-06-161-1/+1
| | | | | | | | | | | | | When configuring with -libdir set to something that is not recognized by CMake's find_package search procedure, top-level builds failed to configure. This was due to a hard-coded lib/cmake directory added to CMAKE_PREFIX_PATH. Fixes: QTBUG-103823 Change-Id: If8b48e35e654089f32cbe4af9936238cd82b3dbb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 96be84d703fb6b0c9ab95040b53c3b78b7a06ce7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* coin: Fix android automotive configuration to use configureAlexandru Croitor2022-06-141-1/+1
| | | | | | | | | | | | | | The UseConfigure feature was enabled, but the configure arguments were not ported. Amends 5e9653ef9736467fe8efe6e71ec468761dcdc8de Task-number: QTQAINFRA-4357 Task-number: QTQAINFRA-4815 Change-Id: I89607aef275370dc27910a5cd1fec7603a1fd576 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 6e95fb2f933788f2293afc230e8fdaf67a88bf7b) Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* coin: Use configure for QEMU Boot2Qt configurationsAlexandru Croitor2022-06-141-6/+9
| | | | | | | | | | | | Use the configure script to configure Qt in the CI, instead of calling CMake directly. Task-number: QTQAINFRA-4357 Task-number: QTQAINFRA-4815 Change-Id: I9aacf3e6f15fc074b52e85da9e3f671b4f58a135 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 64cf9a03b7dfc144ab30551893cfb3535a688e26) Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* coin: Fix iOS tests configuration to pass -debug-and-releaseAlexandru Croitor2022-06-141-1/+1
| | | | | | | | Task-number: QTQAINFRA-4357 Task-number: QTQAINFRA-4815 Change-Id: I578e1238ea187ade908d8174c0c6e5f7a9a9f66f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 6b2298dacfa8369c6ae152f244797f39ad9868ad)
* coin: Use configure for static tests configurationsAlexandru Croitor2022-06-141-6/+10
| | | | | | | | | | | | Use the configure script to configure Qt in the CI, instead of calling CMake directly. Task-number: QTQAINFRA-4357 Task-number: QTQAINFRA-4815 Change-Id: I2d35724074f4180775ca28c4befea1b9de838ecf Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 2566bbfe717453e0c08f8453604b293b816170c8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* coin: Use configure for Integrity configurationsAlexandru Croitor2022-06-141-3/+5
| | | | | | | | | | | | Use the configure script to configure Qt in the CI, instead of calling CMake directly. Task-number: QTQAINFRA-4357 Task-number: QTQAINFRA-4815 Change-Id: I128f5e424481ba8fbb4649c75be818abee57e03e Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 6ec880ea47fd6b8ce074af44feb4ca2a973b4afb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* coin: Use configure for QNX configurationsAlexandru Croitor2022-06-141-10/+13
| | | | | | | | | | | Use the configure script to configure Qt in the CI, instead of calling CMake directly. Task-number: QTQAINFRA-4357 Task-number: QTQAINFRA-4815 Change-Id: Ibb84a88f7f1ebd1f98e9998fac4180b257e80461 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 7c9601115d37f17dc77ecabdc0dbf7883c8e667a)
* coin: Use configure for WASM configurationsAlexandru Croitor2022-06-141-7/+8
| | | | | | | | | | | Use the configure script to configure Qt in the CI, instead of calling CMake directly. Task-number: QTQAINFRA-4357 Task-number: QTQAINFRA-4815 Change-Id: I534b630946f1fd9f79e8466886ea727697cabbc4 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 615091a6a80525e40438bf38e71e194f24114bfa)
* coin: Use configure for Android automotive configurationsAlexandru Croitor2022-06-141-15/+23
| | | | | | | | | | | Use the configure script to configure Qt in the CI, instead of calling CMake directly. Task-number: QTQAINFRA-4357 Task-number: QTQAINFRA-4815 Change-Id: I6fa9d75fab32f7355847a09996876f7e6c0a8b1c Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 5e9653ef9736467fe8efe6e71ec468761dcdc8de)
* coin: Use configure for Android configurationsAlexandru Croitor2022-06-144-29/+43
| | | | | | | | | | | Use the configure script to configure Qt in the CI, instead of calling CMake directly. Task-number: QTQAINFRA-4357 Task-number: QTQAINFRA-4815 Change-Id: I008dd8dfca800e94ea3448bfd2c7ebae3266983e Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit d65844f4a22ca17ab5286ffc80bb400c050cd981)