aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on 'dev' in qt5Liang Qi2018-02-2340-0/+0
| | | | | Change-Id: Ia8de2d8c35a6a021fd22522a642caa82d960aed2 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-02-2119-10/+131
|\ | | | | | | Change-Id: Ib867a3e53f624b8963e6dab311fe5c2a28c87801
| * Merge remote-tracking branch 'origin/5.9' into 5.11Liang Qi2018-02-2016-9/+118
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/provisioning/common/linux/open62541.sh coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh Done-with: Maurice Kalinowski <maurice.kalinowski@qt.io> Change-Id: Icd472b8f770a933bafead48093ecf7eb94156128
| | * Update submodules on '5.9' in qt5Qt Submodule Update Bot2018-02-179-0/+0
| | | | | | | | | | | | | | | Change-Id: Ie7a64cad655dd0e850c8c6145f35b425de6f4c25 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Disable set -e when enabling devtoolset-4 environment variablesHeikki Halmet2018-02-131-0/+1
| | | | | | | | | | | | | | | Change-Id: If427179da490f14963077cd733082258e354710f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Provision: Use specific Python2 version in macOSSimo Fält2018-02-134-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | Make sure we use some specific Python2 version on macOS instead of the one pre-installed along with system. Change-Id: Ifee07a8cf003e282ec3cb67535818f9fe39c8679 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | * Update submodules on '5.9' in qt5Qt Submodule Update Bot2018-02-127-0/+0
| | | | | | | | | | | | | | | Change-Id: I360edc60d8e2740d1964b91e18e02dc5daeea39a Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Provisioning: osx-10.11 - Disable sleepJoni Jantti2018-02-081-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Display sleep and system sleep need to be disabled to prevent the machine from going to sleep during RTA testing. Task-number: QTQAINFRA-1588 Change-Id: Idc91d77388ed9bc6df5f3c1aceca515f6308c618 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * Provisioning: MacOS-10.12 - Disable sleepJoni Jantti2018-02-081-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Display sleep and system sleep need to be disabled to prevent the machine from going to sleep during RTA testing. Task-number: QTQAINFRA-1588 Change-Id: I3dc1642d3714762bfb56963392d2bb5137c13256 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * Remove excess comment line for shellcheckTony Sarajärvi2018-02-071-1/+0
| | | | | | | | | | | | | | | | | | Change-Id: I3e9b8091c158a978bd95e48b18df326c3a545798 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | * Fix environment variable checking for proxyTony Sarajärvi2018-02-075-5/+5
| | | | | | | | | | | | | | | Change-Id: Iec261d4ce4e84ba656edf9de52b4dc42d0249e51 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | * Update submodules on '5.9' in qt5Qt Submodule Update Bot2018-02-077-0/+0
| | | | | | | | | | | | | | | Change-Id: I1254c80a58ec607af3cf3955b3c73e3fb30a516e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * Provisioning: Ubuntu 16.04 x64 - Set grub timeout to 0Joni Jantti2018-02-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Grub timeout should be set to 0 so we save some time whenever the VMs are booted. Task-number: QTQAINFRA-1703 Change-Id: Ia866000703fdc083407d5d8588ba6680ffd80038 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * Provisioning: openSUSE - Disable file indexingJoni Jantti2018-02-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Baloo file indexing sometimes takes up a great amount of CPU capacity and should therefore be disabled. Task-number: QTQAINFRA-1702 Change-Id: I549aef39c1dd2d2fa97196910f577153a42c4f54 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * Provisioning: openSUSE - Set grub timeout to 0Joni Jantti2018-02-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Grub timeout should be set to 0 so we save some time whenever the VMs are booted. Task-number: QTQAINFRA-1703 Change-Id: I67db00d200dc3e5f94ed205b53bb0ca6e70bdd8d Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * Update submodules on '5.9' in qt5Qt Submodule Update Bot2018-02-0338-0/+0
| | | | | | | | | | | | | | | Change-Id: I14c5e22d5c76b64a573fb32b71580e00c2a3eeba Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | init-repo: complain about non-option argumentsOswald Buddenhagen2018-02-201-0/+1
| | | | | | | | | | | | | | | | | | | | | otherwise abuse may go unnoticed (at this stage ...). Change-Id: Ic8c2a843a941cdeb2d69542830eccf7fadcf252d Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | Add RTA targetsMatti Paaso2018-02-201-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>
| * | Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-02-1933-0/+0
| | | | | | | | | | | | | | | Change-Id: I069e5672ed40279dbbd8769be17f5cb328b12bc1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * | Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-02-187-0/+0
| | | | | | | | | | | | | | | Change-Id: I92f9401dc98ab115fe737ec5395025055830140f Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-02-178-0/+0
| | | | | | | | | | | | | | | Change-Id: I5253636ea9da20b20879f4863dc5b037842b9e7b Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Merge remote-tracking branch 'origin/5.10.1' into 5.11Liang Qi2018-02-151-1/+7
| |\ \ | | | | | | | | | | | | Change-Id: I07cebe617c7860cbeede24b2f45c7c508aed5a92
| | * | Update submodules on '5.10.1' in qt5v5.10.1Qt Submodule Update Bot2018-02-096-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Icac819f46b0faa05367d73e2435f98975bda2811 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | Update submodules on '5.10.1' in qt5Qt Submodule Update Bot2018-02-0733-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I88fa5fe223a0e32a3c0261342d490f00561c6497 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Merge remote-tracking branch 'origin/5.10' into 5.10.1Liang Qi2018-02-0747-193/+328
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I275589752f6f623e61841a4552087a1875729615
| | | * | Update submodules on '5.10' in qt5Qt Submodule Update Bot2018-02-069-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I818ad09e1071db0369823caf2cd18da601f3bd05 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * | | Provisioning: Don't test window decorations on Ubuntu 16.04 QEMUJohan Klokkhammer Helsing2018-02-071-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decorations were previously disabled within the Wayland tests to work around another issue. That issue has now been fixed, and decorations have been enabled again, but these tests now became flaky when run within QEMU. Task-number: QTBUG-66173 Change-Id: I23b722ebc0719a2fd359ba5c3c57c66a887c06de Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | | Update submodules on '5.10.1' in qt5Qt Submodule Update Bot2018-02-0512-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ide442890f290ee8ed14950c90f9a0f6852eebc62 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | | Update submodules on '5.10.1' in qt5Qt Submodule Update Bot2018-02-0211-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I00b96bfb3f93027136a770a25c7479b1902bcde4 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Update submodules on '5.11' in qt5v5.11.0-alpha1Qt Submodule Update Bot2018-02-1539-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie33f91194895634fbf837210e534b78e7559989e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | | | Update submodules on 'dev' in qt5Liang Qi2018-02-144-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icbb7b51a46c55ed4ec7690e6cdceedf4680f3b2f Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-02-1310-71/+1
|\| | | | | | | | | | | | | | | | | | | Change-Id: Iac3ddede9c1d6b0de5a30b3490d5564995afaabc
| * | | | Remove macOS 10.10 from CI for Qt 5.11Jake Petroules2018-02-1010-71/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As agreed, this version will not be supported any longer. Change-Id: I37d9d9d9e32b5d17dbf0f80a6c42a8e233bcc446 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | | | Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-02-122-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibb42cbf10eb51d99e5d26a3e616bf488f9b5bd28 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | | | Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-02-112-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id7d9342393bbf3068dd7a1c90dc2afe365d80962 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | | | Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-02-102-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If9edf8eca3865c32db056bb8f167dc47530c9d37 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | | | Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-02-092-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I712f991abb4fb97e341133c295f2d77330a84a68 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | | | Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-02-082-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I29aba3e5aebc6ee4b2e130b70dbf184ad3d79303 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | | | Merge remote-tracking branch 'origin/5.11' into devOswald Buddenhagen2018-02-072-6/+0
|\| | | | | | | | | | | | | | | | | | | Change-Id: Ia8d3b57d6cb1b89de7164d7ecede664cf5bd2f58
| * | | | Remove QtOpcUA from qt5.gitAlex Blasche2018-02-072-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This module is moved to tqtc-qt5. Change-Id: I57641392be0a968dfd51633fcba15e38de45abcd
* | | | | Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-02-0718-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If34630f163416a6ee7b34df5b7f41c47f8f5cfd1 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-02-0747-193/+328
|\| | | | | | | | | | | | | | | | | | | Change-Id: Icf5a559c89f572249cc1fd54d2c11319597afdf9
| * | | | Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-02-0718-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8e2b737f940e5712c49eadf688983607e4ec349c Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Merge remote-tracking branch 'origin/dev' into 5.11Liang Qi2018-02-063-2/+1
| |\ \ \ \ | |/ / / / |/| | | | | | | | | Change-Id: I3354e454e9b8c686e5d696562096a793e4a0b284
* | | | | Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-01-312-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie2e621ae2c2387c7daa0c29c5e04c8928fed169b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | | | Swap qtquickcontrols vs. qtquickcontrols2 statusesJ-P Nurmi2018-01-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt Quick Controls (1) module, which was still listed as an essential module, has not been actively developed for almost three years. Promote Qt Quick Controls 2 as an essential module instead, and demote Qt Quick Controls (1) as an addon. Change-Id: If51c6c17d199ca10a574053d7dba67539a764aba Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | | | Revert "Adjust submodule branches"Frederik Gladhorn2018-01-311-41/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This got merged accidentally. This reverts commit 282899453d2c6b4c51bbd94fc228f2bb711d64f6. Change-Id: I1457513217e636aa54b43a1dc21b01443c798119 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | | | Merge remote-tracking branch 'origin/5.11' into devFrederik Gladhorn2018-01-311-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I30587abcc4062808e13570ff2a158a0fdc60cad2
* \ \ \ \ \ Merge remote-tracking branch 'origin/5.11' into devFrederik Gladhorn2018-01-2947-96/+644
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was pushed directly, bypassing codereview.qt-project.org to get provisioning back into a working state. Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Change-Id: I4eadb7ffafdf5cbc821d1f0a96734b0f83243464
* | | | | | | Add a MSVC2017 platform to the default testedAllan Sandfeld Jensen2018-01-263-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Is needed for qtwebkit and qtwebengine testing and added in dev, where MSVC2013 was removed to not add additional pressure on the CI. Task-number: QTBUG-65830 Change-Id: I48d3a36a9f69f7345d3cf4dc5a652adb62bb461f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 00:50:56 +0000