aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on 'dev' in qt5Liang Qi2019-04-1429-0/+0
| | | | | Change-Id: Ibb626ef0429631b901bfb894935b12cad1af6a5c Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2019-03-312-0/+0
| | | | | Change-Id: I619cf4f0168d08cb2e94b23db557d9a53f9e5338 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2019-03-3038-0/+0
| | | | | Change-Id: I393b5619168e820b3ffbcf7263c47c93abb81aa9 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2019-03-249-0/+0
| | | | | Change-Id: I799f3265c9b6d28de248fc55685b77ea26039816 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2019-03-234-0/+0
| | | | | Change-Id: Ib8090cd0a47e284dc7197cf4614d63d2e2e127a9 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2019-03-2225-0/+0
| | | | | Change-Id: I46929f3d189bc07ee3a9f95cb539bdae57d6d10d Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2019-03-181-0/+0
| | | | | Change-Id: I6c78b9e00e9bdbf579e8b423b42499bea822ceca Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-03-176-22/+85
|\ | | | | | | | | | | | | Conflicts: coin/provisioning/common/windows/helpers.ps1 Change-Id: If35fe38af7b7b1c4bba5009180fe51f37a90aa5c
| * Fix provisioning disable defragmentation for windowsJuha Karjalainen2019-03-151-2/+40
| | | | | | | | | | | | | | | | | | If no scheduled task exist it would throw error causing provisioning to fail. Now catch when scheduling does not exist. Task-number: QTQAINFRA-2823 Change-Id: I3bf24df6116b6c978171950bf5bf954f5ddee533 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-03-143-0/+0
| | | | | | | | | | Change-Id: Ibd880c74a5842a88d8ee0a8cb1eaf3487b4f7192 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-03-145-20/+45
| |\ | | | | | | | | | | | | | | | | | | Conflicts: coin/provisioning/common/linux/emsdk.sh Change-Id: I9ba6a1c52b70b605f0f856b6ce6912fd499792a3
| | * 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 'dev' in qt5Qt Submodule Update Bot2019-03-1710-0/+0
| | | | | | | | | | | | | | | Change-Id: Id296241c270ea33450e57ef07b382930711daa89 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Split docker provisioning filesMaurice Kalinowski2019-03-152-25/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split the creation of the test images and the creation of the docker environment. This way, one can easily recreate the test images, without requiring to re-provision everything. Change-Id: I35bbe8d8bf497f16d9be92cbaa2d9001f8eee247 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Ryan Chu <ryan.chu@qt.io>
* | | Update submodules on 'dev' in qt5Liang Qi2019-03-1525-0/+0
| | | | | | | | | | | | | | | Change-Id: I7484fcfc4915d0e22057b671bba6e63243452ceb Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-03-1420-140/+252
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules coin/provisioning/common/macos/docker_testserver.sh Change-Id: Ifcf97d2ff12ca390e63e814c2a377f6f9135acab
| * | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-03-137-0/+0
| | | | | | | | | | | | | | | Change-Id: I8c823bab00e24f89a748986bf3eacf12d8de1d46 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.13' in qt5v5.13.0-beta1Qt Submodule Update Bot2019-03-138-0/+0
| | | | | | | | | | | | | | | Change-Id: I87f15314cf01a1b0482b1675c1eeaed380d92a3d Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-03-119-0/+0
| | | | | | | | | | | | | | | Change-Id: I696da0adc9f8f11c08765662016972d4c47a8a04 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-03-0811-0/+0
| | | | | | | | | | | | | | | Change-Id: I85f2cd016dc8c3e98e39ebee057d1d6bfc71d19b Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-03-057-0/+0
| | | | | | | | | | | | | | | Change-Id: I20b6331abe3a914c5cf2503be61c34e2efe60016 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-03-0218-0/+0
| | | | | | | | | | | | | | | Change-Id: I798c8bc1278a02cdf9043ed50eade5ff66b6502d Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Provisioning: Update emsdk versionHeikki Halmet2019-03-021-3/+3
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-73867 Change-Id: I4caab8d434787bf4323e1ea3232bf4bf23c1ec8d Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| * | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-02-2713-0/+0
| | | | | | | | | | | | | | | Change-Id: I33af247c322de51b34dc65381be9e4e03261842d Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-02-2712-42/+237
| |\| | | | | | | | | | | | | | | | | | | Conflicts: coin/provisioning/common/windows/android-openssl.ps1 Change-Id: I0755066ece5458040a21b3da6ddbc1656240f5bb
| | * 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.1Qt 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>