aboutsummaryrefslogtreecommitdiffstats
path: root/coin
Commit message (Collapse)AuthorAgeFilesLines
* Provisioning: Install signing tools to osx 10.11Heikki Halmet2019-01-151-0/+138
| | | | | | | Tools are needed by Offline mac build Change-Id: I96efceffc3ee079dcd2c5849078742227b6cd0a2 Reviewed-by: Matti Paaso <matti.paaso@qt.io>
* Provisioning: PyPFD2Joni Jantti2018-11-291-0/+2
| | | | | | | | | | | Required for PDF file reading in RTA tests. Task-number: QTQAINFRA-2103 Change-Id: I4da98460fb5d5ad26f9e1e16c503a0d94be047a6 Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit bb6a91d5d4c684e8a97feca61449b41628afaefa) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Provisioning: Update QNX packages with security patchesJoni Jantti2018-11-083-6/+7
| | | | | | | | | | | | BlackBerry has released security updates for QNX 7.0.0 and 6.6.0 that we want to include in CI since out customers will most likely have them installed. Task-number: QTQAINFRA-1535 Change-Id: I6f38ca8831bb91609f79385a2dcbc51302f68eb8 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit 07e349546c39b8d1b73e96264e764e09c3a4e656) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Provisioning: RHEL-6.6: Update curlJoni Jäntti2018-11-081-0/+2
| | | | | | | | | | | | The currently used version of curl does not support TLS 1.2 or newer. Since download.qt.io has minimum requirement of TLS 1.2 we need to update the these packages. Task-number: QTQAINFRA-2212 Change-Id: I4737443b5b2180a592a18d9095fe3f31063ba329 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 7e67d0e5586b1f5632c9c2c5148ccc75379e1b3f) Reviewed-by: Liang Qi <liang.qi@qt.io>
* Provisioning: Update openssl to version 1.0.2pJuha Karjalainen2018-11-014-12/+12
| | | | | | | | Task-number: QTQAINFRA-2266 Change-Id: I3f09d9169f17bcd83dcfd72547440bca487fd9db Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit 3b4ca5d6c0b44e64efd3776327b4f6714d0d8969) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Provisioning: Win7_x64 - Add Squish 6.3.0 win64 msvc12Joni Jantti2018-10-121-0/+1
| | | | | | | | | | | This package is required by RTA. Task-number: QTQAINFRA-1878 Change-Id: I0496445880f838de34ffd53f72fa05e0f0b0be58 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit 5085220907005503326b8d4f17d52b5e6e00d731) Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Provisioning: Fix downloading from githubMaurice Kalinowski2018-09-171-0/+1
| | | | | | | | | | | | Invoke-WebRequest uses TLS1.0 by default, which is not accepted by Github anymore, causing all downloads from that site to fail. Upgrade to 1.2 to get downloads working again. Change-Id: Ie242432937c273db5c345b38482dd74c19c3b4ca Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io> (cherry picked from commit bd8fe6a46340097b8652285fe05ff4a8c60c141e) Reviewed-by: Liang Qi <liang.qi@qt.io>
* Provisioning: Relocate Libclang and correct sha1Heikki Halmet2018-08-165-6/+6
| | | | | | | | | | | | | Sha1's were changed because Liclang versions were rebuilded. To prevent this Libclang versions are now copied to ci-files01-hki which won't be affected if someone will rebuild libclang versions to download.qt.io. This will also reduce download time Task-number: QTQAINFRA-2156 Change-Id: I9164441cb876ee687db4878d06ba1c02cde601bb Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Provisioning: refactor squish installTony Sarajärvi2018-07-121-67/+33
| | | | | | | Change-Id: I18e5f8f5d92cff5af2335cc5ac4cf571d27224ac Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit de4e9c2169aac41db10fdff1503ad645f0a4a72a) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Merge remote-tracking branch 'origin/5.9.6' into 5.9Liang Qi2018-06-153-4/+108
|\ | | | | | | Change-Id: I10014691a714f8457b9828c31cba76347dcd0f9c
| * Provisioning: Ubuntu - Add QNX 6.6.0Joni Jantti2018-06-022-0/+104
| | | | | | | | | | | | | | | | | | QNX 6.6.0 is required by RTA. Task-number: QTQAINFRA-1914 Change-Id: Id0578050d24fb13f3e10a10e972be790d39f9bc0 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit e8a60ed41bb838f40558ac39e496b4a1e32e9140)
| * Change QNX7 x86 release builds to x86_64Samuli Piippo2018-05-161-2/+2
| | | | | | | | | | | | | | Task-number: QTBUG-67746 Change-Id: I677019909d56d8b227f0607069cbf3ab0cf7fec3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 1c8ff381be103c91f552bd461b794cbf1a590f98)
| * Adjust QNX packaging builds for Qt 5.9Jani Heikkinen2018-05-161-4/+4
| | | | | | | | | | | | | | | | | | - Add missing 'Packaging' flag for linux and windows QNX builds Change-Id: Ie4c49b9bd93f67f6a2dbbdece99da8c8f5fb3bef Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io> (cherry picked from commit de5d8f3b4fdd7dc36b445e7b1385e5516e8f4e20) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Provisioning: Ubuntu - zlib1g:i386Joni Jantti2018-06-131-0/+1
|/ | | | | | | | | | | RTA needs this package for QNX testing. Task-number: QTQAINFRA-1930 Change-Id: I3587558bc1c8ece6dbb29b5f5184f4bfa744a790 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit 93e31c12816298c161a12d5f66d2b65aca48f8ca) Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Add VC build tools to Windows 10 x86 templateJoni Jantti2018-04-251-1/+1
| | | | | | | | | These tools were missing from the installation. Change-Id: I627b28a6f9373df708952e22a7f404b8dbce6239 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 9af755a79eba4a3b57c8e4b75df64070aec27458) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Add a clean installed Win10_x86 for RTAJoni Jantti2018-04-253-1/+3
| | | | | | | | Task-number: QTQAINFRA-1842 Change-Id: I0334d74055690c7f850fd105fe008d11a8e57b8c Reviewed-by: Matti Paaso <matti.paaso@qt.io> (cherry picked from commit 9e74a1e5b7cf5f487b77068565ba7c0671b4dcd0) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Add Windows 8.1 target for RTAMatti Paaso2018-04-251-0/+1
| | | | | | | Change-Id: Ifd055590bada66f7437af0b4de4a8549440952ae Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit b59f4207a3ab830d963eb7b977b650f0e4d6442d)
* Add RTA targetsMatti Paaso2018-04-251-0/+5
| | | | | | | | | | | | Release Test Automation tests are ran also in additional targets compared to qt5 targets. Change-Id: I72ca86f875920ec266e0e6b7ea3fee026eaa1cfe Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit 884490eaaec3b3a150b4262aee3a318dda2ea2c3) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Provisioning: Win10_x86 - Windows 10 SDK with debugging toolsJoni Jantti2018-04-202-0/+51
| | | | | | | | RTA needs debugging tools for Windows 10 x86 testing. Change-Id: I69cae92a2529a933a018f22c1b200bdc4d2c0aa0 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit 081861de184f0e8b5d2b96d3530d048fa49116b8)
* Provisioning: Win10_x86 - psqlJoni Jantti2018-04-201-0/+1
| | | | | | | | | Required by RTA. Task-number: QTQAINFRA-1923 Change-Id: Ia13d9586d1c1934c8c4e51fcbe9ce826bba68524 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit c1e2307d02a768b71a8219e07ccddd86ee44411f)
* Provisioning: Win10_x86 - mysqlJoni Jantti2018-04-201-0/+1
| | | | | | | | | Required by RTA. Task-number: QTQAINFRA-1923 Change-Id: I13d78da0bd3ea2fa8a75734fb5f88a472cbd79de Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit c4040976006cd99ae85bcf8bbd19054d00a7b227)
* Provisioning: Win10_x86 - opensslJoni Jantti2018-04-201-0/+1
| | | | | | | | | Required by RTA. Task-number: QTQAINFRA-1923 Change-Id: I4937980a1f23d56e509b71541605c80cb6423402 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit 3d6736a7f110f42935ffbd4e1691b1d3e57f6443)
* Provisioning: Fix Squish installation for msvc14 32-bitHeikki Halmet2018-04-201-3/+3
| | | | | | | | | | Task-number: QTQAINFRA-1809 Change-Id: I8a2947fe52535e39b0817fec2ee0c35bb09e4060 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io> (cherry picked from commit 3410bab2783875403e43ae8875901da3605ece23) Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
* Unify Windows provisioning scripts & improve error handlingOliver Wolff2018-04-2054-382/+372
| | | | | | | | | | | | | | | | | | | | | | | | While Coin should also see exit codes != 0 as error, we should stick to one way of handling script errors. As Power Shell cmdlets signal an error by throwing an exception we should do the same (and that approach also works in Coin). Additionally extracting 7zip files was unified across scripts by using the existing helper function instead of reinventing the wheel again and again. A similar helper function was introduced for starting an external application (and handling its errors). Also echo and other "cmd" commands were replaced by their PowerShell equivalents to have a unified approach across our Windows provisioning scripts. Change-Id: I70129ce38692f1396c33c13b33a2918485fa5271 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> (cherry picked from commit cb6709ce5c48a31ba1170c71494c1a3869ffa5bb) Reviewed-by: Simo Fält <simo.falt@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Windows 10: Enable developer modewip/qtsaferenderer/1.0Oliver Wolff2018-04-183-0/+7
| | | | | | | | Developer mode is required by RTA for testing. Change-Id: I4f20fb8d694d5148b7f976c1ef4bb23ff2fb57ba (cherry picked from commit f51fd755b5b1594744b6e68f630dd4d6c8167b6b) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Provisioning: Win10 - Add Squish for mingw53Joni Jantti2018-04-181-0/+6
| | | | | | | | | | RTA requires Squish for mingw53 on Windows 10 machines for testing. Task-number: QTQAINFRA-1729 Change-Id: I42f2c6c62dd004ebc072835340ce24105cfac5e8 (cherry picked from commit 5e31866727b4485f07a17295277be889305c4b3b) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Provisioning: Win7-x86 - Add msvc14_x86 squish packageJoni Jantti2018-04-181-0/+3
| | | | | | | | | | Squish is required by RTA testing. Task-number: QTQAINFRA-1732 Change-Id: I8ab0b11ccc299cc0b10e59f99d1cf27c0cdd48b9 (cherry picked from commit f6f00fdce1f3f00775e8b399dc8813883af5bf90) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Provisioning: win10_x86 - Disable automatic updatesJoni Jantti2018-04-181-0/+1
| | | | | | | Task-number: QTQAINFRA-1814 Change-Id: I69b4f57808fe039208d9a92d288a74a09148db39 (cherry picked from commit 3230cdb138878df7dc6daa0f44e86c565629b2f2) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Provisioning: Ubuntu 16.04 - QNX700Joni Jantti2018-04-181-0/+38
| | | | | | | | | | QNX 7.0 is required by RTA on Ubuntu. Task-number: QTQAINFRA-1671 Task-number: QTQAINFRA-1914 Change-Id: I82821e096cfa2d35a2176eba6e753a0d71049b72 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit dc6c54cb2d526141de75733bdba6d87fa3594ab6)
* Revert "Install Python 2.7.13 to RHEL with pip"Simo Fält2018-04-181-5/+6
| | | | | | | | | | | This reverts commit 794913dde77e9a2918353894a33d03b16e6927c4, which seems to break pyside builds. Instead we install python-pip package from the EPEL repository. Change-Id: Ic84680b0b0d6950d389bb42a6add18c83256f00f Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit 6a06c4b4fe7fad6595252ac035fc0c05627b62c6) Reviewed-by: Simo Fält <simo.falt@qt.io>
* Provisioning: Upgrade pip to latest versionHeikki Halmet2018-04-184-10/+24
| | | | | | | | | | | | | | Latest pip version is not installed during python installation. Pip need to be reinstalled after python installation because older version of pip seems to cause installation problems randomly at least with python 2.7 Task-number: QTQAINFRA-1902 Change-Id: If3d74130ecee6e410c64cad309feff9edc0e5db0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit 2e6af2bba76358323d386a8287b9f34b08210347) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Provisioning: Remove sha1 file after shasum checkHeikki Halmet2018-04-181-0/+1
| | | | | | | Change-Id: Iee8e66d98e5ebd2dee18baf8e1752a86065417d1 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit c79d285ffa13590192e7768f7923645c73026a27) Reviewed-by: Liang Qi <liang.qi@qt.io>
* Remove updating of RHEL 7.4 system during each provisioningTony Sarajärvi2018-04-181-1/+0
| | | | | | | | | | | | | Yum update doesn't only fetch the repository data. It also runs a distro upgrade. So if something gets updated that isn't compatible with us, it breaks. It also slows down the provisioning a lot. Change-Id: I27136bc572fbce5410b82ff9574cf85bf89e3100 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit daeaec9b3cf8125256b01f16c77b67383ff6f301) Reviewed-by: Liang Qi <liang.qi@qt.io>
* Install Python 2.7.13 to RHEL with pipTony Sarajärvi2018-04-181-2/+5
| | | | | | | | | | | | | System's default Python is 2.7.5 and doesn't come with pip at all. To install its pip, it would require us to enable the EPEL repository and install it from there. The repos we use already include Python 2.7.13. If we install that we get pip as well. Change-Id: I083a970697a962ddb301616695c2cf419f1229f8 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit 794913dde77e9a2918353894a33d03b16e6927c4)
* Remove duplicate python-devel provisioning from RHEL 7.xTony Sarajärvi2018-04-181-1/+0
| | | | | | Change-Id: I445135d675fa6b5cb305f6aadf5b754ab248a1ff Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit f1eca9bbff35b4640c4779fb4b5cad25c33f7de0)
* Make unzip less verbose in macOSTony Sarajärvi2018-04-181-1/+1
| | | | | | | Change-Id: I83249f724ecbfeeb4fd5c1cd33a9c6195c590c4b Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit ab021d4bb4a92143892a68d89dbe9f3dd4e3f81f) Reviewed-by: Simo Fält <simo.falt@qt.io>
* Update Python 3.4 to 3.6 in RHEL 7.xFrederik Gladhorn2018-04-182-54/+5
| | | | | | | | | Also install Python 3 through system packages instead of some weird scripts. Change-Id: Ie22e126a422bd6efe9b3030d5044f4c196894ca8 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit 9ae91ae3f87fb3e3ad030410c4d313cb217f530b)
* Install RHEL EPEL only onceRainer Keller2018-04-183-21/+50
| | | | | | | | | | Installing twice will fail when preventing the +e injection bug when fixing the try-catch issue. Change-Id: I26a1b9fa235c44fe933f2f29016a80f57d47ed49 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> (cherry picked from commit 9cb66c01143afa2b8115507c693a7266a31da6bb) Reviewed-by: Simo Fält <simo.falt@qt.io>
* Disable background update checks in RHEL 7.xTony Sarajärvi2018-04-181-0/+4
| | | | | | Change-Id: If17fd47850be8b3a59ded7e0a543c9160f92b84c Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit f6d18ec9b3e6cc65b687810f39a570a0b39439cd)
* Provisioning: Fix java installation for macHeikki Halmet2018-04-181-19/+10
| | | | | | | Change-Id: I3b6672e671720416af71631c2f9ce814f07e596a Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit a6feaec2877d9089d9b9ba5c934b89a4de78de42) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Remove try_catch.sh helper scriptTony Sarajärvi2018-04-181-64/+0
| | | | | | | Change-Id: I3981920bb8085ffbad89c31e0fd628a6e11146b6 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 1b5f8cec03297af93150537cc3c8eb0bcd01f3fc)
* Simplify openssl_for_android_linux provisioning scriptJędrzej Nowacki2018-04-181-31/+9
| | | | | | | | | | | | | The script was over-engineered. The new version provides the same functionality while removing uninteresting postmortem messages. In addition try_catch.sh has a bug that injects set +e So it is good to avoid using it. Change-Id: I9e26e8fedad71d40270fe94695d5e1c09c3d9023 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit bb9739773ccd2844bad5e8c0124405acb3315ecb) Reviewed-by: Simo Fält <simo.falt@qt.io>
* Remove try_catch codes from unix scriptsTony Sarajärvi2018-04-183-191/+77
| | | | | | Change-Id: Iabadbf28c65132ae614048cb98e92f57e3786056 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 90261c1df5cb62a47b44d2d9b84c0753d6ebf9e4)
* Provisioning: Move http_proxy.txt under shared folderHeikki Halmet2018-04-183-2/+2
| | | | | | | | Change-Id: Id5b2f07a92eadfb21fbfdb3fb65621d6322dc8c4 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> (cherry picked from commit 23b4bcf6c5773f1499e89b132e87e4d0333676a7) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Set proxy on Windows VMs while provisioningTony Sarajärvi2018-04-1813-1/+128
| | | | | | | Task-number: QTQAINFRA-1669 Change-Id: Ia6b5b668051642a3729d7c7c83c69d8797045847 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 54d8396d681c97ace18e2710394b8b34fa8f0411)
* Remove try_catch codes from common macOS scriptsTony Sarajärvi2018-04-186-321/+106
| | | | | | | Change-Id: I66291e2da5514499387b61e01ad85a652cd24d7b Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit a98b0f3d7989bedf6f0bcc1a83b52aad1d3baa3e) Reviewed-by: Simo Fält <simo.falt@qt.io>
* Remove try_catch codes from macOS 10.12 provisioningTony Sarajärvi2018-04-185-186/+52
| | | | | | | Change-Id: I57fbfdef3e8105e9e66c576ef545fc6c22400ac7 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 2f9a2f65e5497d1620aa9edbea8d4523ffe5ce89)
* Provisioning: osx-10.11 - JavaMatti Paaso2018-04-183-131/+137
| | | | | | | | This is needed for running RTA jobs in Coin. Change-Id: Iff855dae54babef00c055a2c8b938871101305e3 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit c3b33afc322dc24120741722b680d0cccc3e2cb1)
* Remove try_catch codes from macOS 10.11 scriptsTony Sarajärvi2018-04-183-72/+19
| | | | | | | Change-Id: I7690ae186729b3a180b1d38c298a861d981dbf5d Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 250dd8c84eef62fbdb51856b367225adfabd643e)
* Remove try_catch from common linux scriptsTony Sarajärvi2018-04-181-73/+34
| | | | | | | Change-Id: I9c7b472fa4c448f40c9adc6cc8a0d84cb9c5e74c Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 1c6abfae014b3ece4d14d3dc7b9a22353cf18c66)