summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on '5.12.3' in qt5v5.12.3wip/qt3dstudio/runtime2wip/qt3d-runtime/master5.12.3Qt Submodule Update Bot2019-04-1114-0/+0
| | | | | Change-Id: I173c80b1d080350d41108aac01b8d66de0dcfb56 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.12.3' in qt5Qt Submodule Update Bot2019-04-0535-0/+0
| | | | | Change-Id: I216b93959076bc9402c715599398dea770cacde2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.12.3' in qt5Qt Submodule Update Bot2019-03-307-0/+0
| | | | | Change-Id: I34e1bd8f276b6e9eb2a1f658f2447fdd01fd4d09 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Adjust submodule branchesKari Oikarinen2019-03-251-40/+40
| | | | Change-Id: I28500be5d253a4d047cef1409659c275c314d5b0
* Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-03-237-0/+0
| | | | | Change-Id: I944abf1de570b68229ba2284e93e879aadc21b2d Reviewed-by: Liang Qi <liang.qi@qt.io>
* Remove 32bit MSVC 2015 from the CITony Sarajärvi2019-03-231-1/+0
| | | | | | | | Task-number: QTQAINFRA-2251 Change-Id: I4006c7390759e2eb357309de36eb23af007a576e Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Provisioning: Remove certificate printing to logJuha Karjalainen2019-03-221-2/+2
| | | | | | | | | | macOS openssl provisioning printed certificates to log. This patch prevent printing certificates to log by redirecting it to /dev/null Task-number: QTQAINFRA-2841 Change-Id: I9ec120212a1f068fa040a302cb50e775857cbb74 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
* Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-03-224-0/+0
| | | | | Change-Id: Idba1b3637a56b7bf822c6a0bff29dd91dca735b7 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-03-2140-0/+0
| | | | | Change-Id: I5cd2a0098c21f4d4691261fd5c2c1f535f119a77 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.12.2' into 5.12Liang Qi2019-03-213-3/+24
|\ | | | | | | Change-Id: I8795e84dd750cbb2b55a03c861b911f57a1e2626
| * Update submodules on '5.12.2' in qt5v5.12.2wip/qt3dstudio/2.3wip/qt3d-runtime/2.35.12.2Qt Submodule Update Bot2019-03-082-0/+0
| | | | | | | | | | Change-Id: I9fc68dfd357dd32546248dee88558744502cb24c Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Update submodules on '5.12.2' in qt5Qt Submodule Update Bot2019-02-2812-0/+0
| | | | | | | | | | Change-Id: I3448762f4f01e6fd334927713a61c8d1d6881ab6 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Remove qt3d-runtime.txt symbolic link from platform configurationsAntti Kokko2019-02-281-1/+22
| | | | | | | | | | | | | | | | | | | | Caused recursion in CI platform configuration parsing algorithm. Add qt3d-runtime.txt back as regular file. Task-number: QTQAINFRA-2804 Change-Id: I11c42a70dcd2157501d4b1f0f67fc7a77a575d31 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.12.2' in qt5Qt Submodule Update Bot2019-02-273-0/+0
| | | | | | | | | | Change-Id: Ifc604747b5d94f44948a710e2f9b1c0a5318eaa5 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.12.2' in qt5Qt Submodule Update Bot2019-02-2313-0/+0
| | | | | | | | | | Change-Id: Id1d8765c3a400a7e12725ccf7fcff5aef49c47c0 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.12.2' in qt5Qt Submodule Update Bot2019-02-2126-0/+0
| | | | | | | | | | Change-Id: I131875e52b21ab1c354955cf82427470094da8ea Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Fix: Set correct path to environmental variableJuha Karjalainen2019-02-182-2/+2
| | | | | | | | | | | | | | | | Env variable BREAKPAD_SOURCE_DIR had /src at end which was not needed. Change-Id: I4d126c3b7c3b2da03dc2a0ba075b0d4ddad92eeb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Update submodules on '5.12.2' in qt5Qt Submodule Update Bot2019-02-164-0/+0
| | | | | | | | | | Change-Id: Iea1284a0920bbae7ebefda199db7564f3d874edc Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Adjust submodule branchesKari Oikarinen2019-02-131-40/+40
| | | | | | | | Change-Id: I309db20815d3b383155e6549b649607e956b8d89
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-03-2041-0/+0
| | | | | | | | | | Change-Id: If57974194302222651f94a7e7b99cc4e34c3b3a1 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Provisioning: add dependency walker to win10 x86Johanna Äijälä2019-03-201-0/+1
| | | | | | | | | | | | | | | | Needed by RTA. Change-Id: I51889477dd6e6f4bdff509ab8f6c1b8307842ebd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | Provisioning: Make gnuwin32 available for windows machinesHeikki Halmet2019-03-177-0/+58
| | | | | | | | | | | | | | | | | | | | This script will install gnuwin32 to the windows machines so it can be removed from qt5 Task-number: QTBUG-73422 Change-Id: I40b7963efcf047525626fe6f1e3ba50b54d68199 Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | Add Squish for MSVC2017 x64 to Win10 x64 machinesJohanna Äijälä2019-03-141-0/+3
| | | | | | | | | | | | | | Also Squish for MinGW x86 on Win7 x86. Change-Id: Ie73371b7993f94f32ef1cd2b90f340cf20935e0b Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | Update comment in clang-format filePaul Wicking2019-03-111-1/+2
| | | | | | | | | | | | Change-Id: I18f14a1956f508317f8a3995873a14bc1af29594 Reviewed-by: Andy Maloney <asmaloney@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-03-113-0/+0
| | | | | | | | | | Change-Id: I4f983c014f06d1d396b13fde8e58d473bf5c988a Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Provisioning: Help script for removing itemsHeikki Halmet2019-03-102-2/+20
| | | | | | | | | | | | | | | | | | | | Sometimes items are locked (access denied) so we need to have function which waits and retry until removing is possible. Task-number: QTQAINFRA-2806 Change-Id: I09055c45c0e439ed1a20eb575ee79b7ca22c5745 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-03-082-0/+0
| | | | | | | | | | Change-Id: I324c45e79a1719943cdd8544a3ddbefc9394421c Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update clang-format configPaul Wicking2019-03-081-2/+3
| | | | | | | | | | | | | | | | | | | | Set column width to 100 as described in the official Qt coding style (https://wiki.qt.io/Qt_Coding_Style). Also, break constructor initializers before the colon and after the commas. Change-Id: I6ac5a21ce831a35a0d74e699192ba981c8a8ba3c Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-03-0810-0/+0
| | | | | | | | | | Change-Id: Ie5d3cf0419efe268c3268fd4e5038c61677e57ea Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update Squish to 6.4.3Johanna Aijala2019-03-072-15/+17
| | | | | | | | | | | | | | | | | | | | Froglogic has not yet released Squish for Qt5.13 but we can use Squish packages build with Qt5.12. Remove msvc12 Squish, not needed. Change-Id: I1de1bb67a5577fa7f7233c69c3a58bedd15fd16b Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-03-055-0/+0
| | | | | | | | | | Change-Id: I99b557104856e3cbf7375f56e7f42b77430bf49f Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-03-0211-0/+0
| | | | | | | | | | Change-Id: I31fc2036208413ee138e6154f65af60e15f0e00c Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.12' in qt5Liang Qi2019-03-0115-0/+0
| | | | | | | | | | Change-Id: I20eba8a90e0683263245a01eac5a553c78961050 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Provisioning: Update emsdk versionHeikki Halmet2019-02-261-3/+3
| | | | | | | | | | | | Task-number: QTBUG-73867 Change-Id: I2aabbecbce2fc3378db6c0747fc8146c03fac545 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-02-157-0/+0
| | | | | | | | | | Change-Id: Ia2c669226e73a545a19c941c5672972a92049534 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-02-146-0/+0
|/ | | | | Change-Id: Id119f941479fac5fa63c281ea21555ff99dc9a47 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-02-139-0/+0
| | | | | Change-Id: I75976d5f76dfac7cca5e13cf619a1d019b3bc5e3 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Fix provisioning script dxsdk.ps1Juha Karjalainen2019-02-121-7/+7
| | | | | | | | | Due to typo in dxsdk.ps1 provisioning script, it did not download from cached location. Also checksum Check was missing. Task-number: QTQAINFRA-2614 Change-Id: I321549721b256b85513fa1e4ff57ab1302e28f43 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-02-128-0/+0
| | | | | Change-Id: I758a05cd029f8252523681c19b657e76c7bb22dc Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-02-117-0/+0
| | | | | Change-Id: I5a8f3943047e4b222795c08aeb6593b0225ada99 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-02-084-0/+0
| | | | | Change-Id: I7c99a0f95deb83a7aa81f68e1e1be2a7466b21d2 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-02-0714-0/+0
| | | | | Change-Id: I609f70ead9f00039d3c89f9e26b1301bb18931c0 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.12.1' into 5.12Liang Qi2019-02-060-0/+0
|\ | | | | | | Change-Id: I73b9cf3d1cdb2a9f2f88e5568f61447469f45313
| * Update submodules on '5.12.1' in qt5v5.12.1wip/emulator/masterQt Submodule Update Bot2019-01-291-0/+0
| | | | | | | | | | Change-Id: I31b89394b870ee1c20d3be5add7fed60e9b23d80 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.12.1' in qt5Qt Submodule Update Bot2019-01-263-0/+0
| | | | | | | | | | Change-Id: I3ad370f5f6312e22508a37f5618c979b60381987 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.12.1' in qt5Qt Submodule Update Bot2019-01-2213-0/+0
| | | | | | | | | | Change-Id: Idc5f439eb75011f6ec422f37050ced3fec879a6c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.12.1' in qt5Qt Submodule Update Bot2019-01-148-0/+0
| | | | | | | | | | Change-Id: I0e1da14b452ed6237831dca5459627f29621182e Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.12.1' in qt5Qt Submodule Update Bot2019-01-1112-0/+0
| | | | | | | | | | Change-Id: Idf66e86252cea5b32bac9df3ebaa592936bc34d6 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.12.1' in qt5Qt Submodule Update Bot2019-01-1013-0/+0
| | | | | | | | | | Change-Id: I8768b71048a5602b4a716b3a6da8b570f5e8e51a Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.12.1' in qt5Qt Submodule Update Bot2019-01-0940-0/+0
| | | | | | | | | | Change-Id: I6bfbe10520706d6c93037585b1e78b8b85cd3ea1 Reviewed-by: Liang Qi <liang.qi@qt.io>