aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Provisioning: Reset Time Zone for macOS 10.14Heikki Halmet2021-04-132-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | Setting Time Zone for macOS 10.14 seems to be flaky. Let's reset it. If it still fails to set it then exit the script execution. Task-number: QTBUG-92174 Change-Id: I07b28d0511d8fc097a1da43b78de9a5131f6bfa7 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit ba149a162bb5683fbc139f57f4669f970f47f03d) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit c84925c5122732d280837be444d82943c2f7bf73)
| * Provisioning: Install Nodejs using pkg instead of BrewHeikki Halmet2021-04-134-8/+56
| | | | | | | | | | | | | | | | | | | | | | Openssl is one of Nodejs dependencies when installing it via Homebrew which is causing issues with actual openssl source build during provisioning Task-number: QTQAINFRA-4402 Change-Id: I711c0f2bb7faebb3e5cbe2f415f34b2ac2d38a66 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 26c97222c11ad27bb495dcf85ff5c0256b9a0f12)
* | Merge branch 6.0 into pyside6.0Qt Forward Merge Bot2021-04-0913-0/+0
|\| | | | | | | Change-Id: Ifbe71d5f2301bf7f4af32ad283c0a006583aee80
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-04-0913-0/+0
| | | | | | | | | | Change-Id: I7d887288d7bdae8dcad2340805cc12cd939584bc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-04-0913-0/+0
| | | | | | | | | | Change-Id: Iffbdf28f5c0cbb7f7805045835e0b662eb571ebd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-04-0813-0/+0
| | | | | | | | | | Change-Id: I2cfc68cd3059f9f423dadc6719351ccc1b0a0c9f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Merge branch 6.0 into pyside6.0Qt Forward Merge Bot2021-03-3111-4/+4
|\| | | | | | | Change-Id: I2c9feb7c493239cde76e2a77da81b9e7928b76a4
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-319-0/+0
| | | | | | | | | | Change-Id: I7134ea8c8cce3b127337725245f12b5f9323b801 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Provisioning: Upgrade Xcode to version 12.4 for macOS 10.15 and 11.0Heikki Halmet2021-03-302-4/+4
| | | | | | | | | | | | | | | | Task-number: QTQAINFRA-4230 Change-Id: Id3de8771e18da5d40cf62ad501a23fce89e845c4 Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit 7a027b4dfdf4baa65ebb07f748849aa47d5079b2)
* | Merge branch 6.0 into pyside6.0Qt Forward Merge Bot2021-03-3013-0/+0
|\| | | | | | | Change-Id: Ib14f9942c3ce3d4e99f7d0eeeb19e706fb2617e0
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-3013-0/+0
| | | | | | | | | | Change-Id: Ib6f70844608788752db228e93d1f8e190772f1d8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Merge branch 6.0 into pyside6.0Qt Forward Merge Bot2021-03-2911-36/+24
|\| | | | | | | Change-Id: I84b99d38e515a322d23839b473972f3d1da981b1
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-299-0/+0
| | | | | | | | | | Change-Id: Iba76968d0845b67082705a6fe523407d03c2ba41 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Provisioning: update Squish packgesJohanna Äijälä2021-03-282-36/+24
| | | | | | | | | | | | | | | | | | | | | | Still using unreleased custom snapshot packages from Froglogic. macOS: use custom build Qt5.15 package with separate Squish server adjusted for Qt6. Change-Id: I8605204118015feb347268c335ef731ff99e3c68 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 02d4c34b7da7d0d885b79528276aa1e596c257c3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Merge branch 6.0 into pyside6.0Qt Forward Merge Bot2021-03-2714-0/+41
|\| | | | | | | Change-Id: I461dae6eff735c0d39b44dd81b8a1013aba19748
| * Provisioning: Install GCC toolset for CentOSHeikki Halmet2021-03-261-0/+41
| | | | | | | | | | | | | | | | | | | | GCC toolset provides upgraded GCC version for CentOS. Change-Id: Ia62c7abf21eeed5d65c6b2e35fe1013d839cfa24 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit 066964d275e37487e09df21a2759a0c127e06b7b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-2613-0/+0
| | | | | | | | | | Change-Id: I361b0238a67f8522430bd9e4da153d16e88d1671 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update additional submodulesSimo Fält2021-03-262-0/+0
| | | | | | | | | | Change-Id: I22d612f195508a8317bb4e41ec472c8a2c0b6e23 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge commit 'b021c416b50598dd8da6e7099318ab4b31b6e3ab' into pyside6.0Simo Fält2021-03-2623-12/+37
|\| | | | | | | Change-Id: I3ca531ac8f6b72d6d2ad4e28522b3ef4ab8e8f80
| * Update submodules on '6.0' in qt/qt5v6.0.3Qt Submodule Update Bot2021-03-2613-0/+0
| | | | | | | | | | Change-Id: Ifff28ca8c055f02e19818be673b962aca7cdbf3f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update documentation for init-repositoryPaul Wicking2021-03-251-5/+8
| | | | | | | | | | | | | | | | | | There's no mention of additionalLibrary status. Change-Id: I3ebf8fdc6dcfc01392b1ab5a42734cef81d6fc61 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit ed139ea47e21984e64a130b167ed715adf319234) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-249-0/+0
| | | | | | | | | | Change-Id: Ic13adf9282cea81f8fd00187cf343bf33994243b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-2312-0/+0
| | | | | | | | | | Change-Id: Ie4614881e3b92023f300cf9e82df6661226b93bb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-2314-0/+0
| | | | | | | | | | Change-Id: I192cca38ff1deb2fec4e7c5112f5f3427a2ffc42 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-2213-0/+0
| | | | | | | | | | Change-Id: Id619a45a77efda40079bd172da5b92cfe24405f1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-228-0/+0
| | | | | | | | | | Change-Id: I6168a62d97c3ae1e2d4d1063e9f77a96e6ca1d9b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-1913-0/+0
| | | | | | | | | | Change-Id: I0f9ae377b375e01767e0b5db1385d37a2ac7d239 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-1812-0/+0
| | | | | | | | | | Change-Id: Id8442e10ef72de96201c1a1ff96b94ecf2e81988 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-182-0/+0
| | | | | | | | | | Change-Id: I7d538c58d6b92474c0376b2db670c02c85243705 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-1713-0/+0
| | | | | | | | | | Change-Id: Ica8e1b80990fc5765d1ab9539b1d2a5ea25780e6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-173-0/+0
| | | | | | | | | | Change-Id: I4fdbc53169d9e446f68a9afd01d38c77f7a72178 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-1313-0/+0
| | | | | | | | | | Change-Id: Ib60b526f1119abddc08db9eacb8a13bc67140aa0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-1212-0/+0
| | | | | | | | | | Change-Id: I5a0e81d1050911480176ea8c47d89d9f357f25d3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Fix init-repositoryPaul Wicking2021-03-121-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Introducing additionalLibrary to .gitmodules broke init-repository. Add the new state also here. Task-number: QTBUG-90669 Change-Id: I3ac9960427ef2fd8fe39b508b69459f4fcf81ca7 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io> (cherry picked from commit 414165e36614dc0f0267df280ea892e1914f1776) Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-1212-0/+0
| | | | | | | | | | Change-Id: I3c96114fe38788172dec85558f0dca4d02bdeaf9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-1212-0/+0
| | | | | | | | | | Change-Id: I3955d571bdc65cdf25ea8fad436a174e03d9698c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-1213-0/+0
| | | | | | | | | | Change-Id: I847ea44eb219d62db0c9995ce958db63d96caf9f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-118-0/+0
| | | | | | | | | | Change-Id: I52d3d5eadfd70b536395707b274fcb1213d50a03 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-0914-0/+0
| | | | | | | | | | Change-Id: Ic32b021870b95b11e5052f06719fa51682d2e61d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-098-0/+0
| | | | | | | | | | Change-Id: Ic1753dd735fca577e9eef3259ef86ba34045aac0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-0813-0/+0
| | | | | | | | | | Change-Id: If8e2dafdbd5dd5f35597c189c0e35dafff17d0ef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Jani Heikkinen2021-03-056-0/+0
| | | | | | | | | | Change-Id: I0ec016b5f2d690f66933d74501f12338287a2f51 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-0413-0/+0
| | | | | | | | | | Change-Id: Ife4c80edbf8615591547ccb48a027c272e1eeabf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-044-0/+0
| | | | | | | | | | Change-Id: I502feee6229dca5c48cd930d954a67a02d1cde8a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-0213-0/+0
| | | | | | | | | | Change-Id: Ie8281ffd56ed6caab105f85afbd0d375db78d28f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-03-013-0/+0
| | | | | | | | | | Change-Id: I8d70b77128db9575d864414f1c9ea3cdb9c24e7d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Add missing additional libraries in qt5.gitJani Heikkinen2021-02-267-6/+24
| | | | | | | | | | | | | | | | We are now supporting 'status = additionalLibrary' for submodules. So add missing additional libraries and update statuses accordingly Change-Id: I4e87b92e15ec54e965af94af5841cd3a8a8278ef Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
| * init-repository: Fix incorrect use of 'or' operatorTopi Reinio2021-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | This fixes the warning 'Useless use of a constant ("qt5") in void context at ./init-repository line 649.' Change-Id: I12133b30b504e536eaf68e4260df5aed28543eb6 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 8ebf0095c38fa5aee577cbd0fd325346f9712ddb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Provisioning: Remove squish script call under Windows 10 x86Heikki Halmet2021-02-251-1/+0
| | | | | | | | | | | | | | | | | | | | RTA don't use squish with Windows 10 x86 in Qt6 Pick-to: dev Pick-to: 6.1 Change-Id: Ib1c27e53310506f2c91ab8b65404caba8fcfcaf8 Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Update submodules on '6.0' in qt/qt5Qt Submodule Update Bot2021-02-251-0/+0
| | | | | | | | | | Change-Id: I6b4e6e1895861099c2695f840d5c9d709829a5da Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>