Commit Graph

2572 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
5186a96b47 Update submodules on '5.11' in qt5
Change-Id: I5253636ea9da20b20879f4863dc5b037842b9e7b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-17 10:52:39 +00:00
Liang Qi
ea28c00dd6 Merge remote-tracking branch 'origin/5.10.1' into 5.11
Change-Id: I07cebe617c7860cbeede24b2f45c7c508aed5a92
2018-02-15 20:59:29 +01:00
Qt Submodule Update Bot
443328fa9f Update submodules on '5.11' in qt5
Change-Id: Ie33f91194895634fbf837210e534b78e7559989e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v5.11.0-alpha1
2018-02-15 13:51:31 +00:00
Heikki Halmet
404805141a Disable set -e when enabling devtoolset-4 environment variables
Change-Id: If427179da490f14963077cd733082258e354710f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-13 19:32:03 +00:00
Simo Fält
769a34ed26 Provision: Use specific Python2 version in macOS
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>
2018-02-13 19:32:00 +00:00
Qt Submodule Update Bot
066373c9c6 Update submodules on '5.9' in qt5
Change-Id: I360edc60d8e2740d1964b91e18e02dc5daeea39a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-12 18:50:11 +00:00
Qt Submodule Update Bot
c77d4946b2 Update submodules on '5.10' in qt5
Change-Id: Ie45f18cc0c70cca437cadd8bfaa6e8a4ac0c81b8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-12 08:16:58 +00:00
Jake Petroules
355252621c Remove macOS 10.10 from CI for Qt 5.11
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>
2018-02-10 19:15:51 +00:00
Qt Submodule Update Bot
5611fe34b0 Update submodules on '5.10' in qt5
Change-Id: Ica319a5d98406174ce94d2e3c3784364ab44c642
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-10 07:47:25 +00:00
Mitch Curtis
e30de965b9 .gitmodules: update recommended modules for qtvirtualkeyboard
The basic example will start using qtquickcontrols2, so recommend that.
Remove qtquickcontrols, as it wasn't used.

Change-Id: Ieaab1480e6a85ecaa24888fa58024d728d863a16
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-02-09 18:36:54 +00:00
Qt Submodule Update Bot
b2b076782f Update submodules on '5.10' in qt5
Change-Id: I06c4afea4e574aa78f37009db512ba25194f6d5d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-09 12:47:17 +00:00
Qt Submodule Update Bot
f2dbac41cf Update submodules on '5.10.1' in qt5
Change-Id: Icac819f46b0faa05367d73e2435f98975bda2811
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.10.1
2018-02-09 10:59:13 +00:00
Qt Submodule Update Bot
456a4d6453 Update submodules on '5.10' in qt5
Change-Id: I935d6ad075384973425d48782a105a9e3e7d21a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-08 09:31:00 +00:00
Joni Jantti
cadedac3b4 Provisioning: osx-10.11 - Disable sleep
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>
2018-02-08 08:04:47 +00:00
Joni Jantti
af55ddc913 Provisioning: MacOS-10.12 - Disable sleep
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>
2018-02-08 08:04:44 +00:00
Qt Submodule Update Bot
9d73a2b304 Update submodules on '5.10.1' in qt5
Change-Id: I88fa5fe223a0e32a3c0261342d490f00561c6497
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-07 16:00:46 +00:00
Liang Qi
6cd75cce72 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I71b7fd09cd8f1c7e64531eec8a645c06a7066325
2018-02-07 13:58:54 +01:00
Alex Blasche
d212f48b67 Remove QtOpcUA from qt5.git
This module is moved to tqtc-qt5.

Change-Id: I57641392be0a968dfd51633fcba15e38de45abcd
2018-02-07 11:32:54 +01:00
Liang Qi
25a0f1fa08 Merge remote-tracking branch 'origin/5.10' into 5.10.1
Change-Id: I275589752f6f623e61841a4552087a1875729615
2018-02-07 09:37:28 +01:00
Tony Sarajärvi
c3096caa14 Remove excess comment line for shellcheck
Change-Id: I3e9b8091c158a978bd95e48b18df326c3a545798
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-07 06:30:47 +00:00
Tony Sarajärvi
b4b62658ac Fix environment variable checking for proxy
Change-Id: Iec261d4ce4e84ba656edf9de52b4dc42d0249e51
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-07 06:30:44 +00:00
Qt Submodule Update Bot
052aa06ef4 Update submodules on '5.9' in qt5
Change-Id: I1254c80a58ec607af3cf3955b3c73e3fb30a516e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-07 06:30:41 +00:00
Joni Jantti
38649924df Provisioning: Ubuntu 16.04 x64 - Set grub timeout to 0
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>
2018-02-07 06:30:38 +00:00
Joni Jantti
9fa8b3ca35 Provisioning: openSUSE - Disable file indexing
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>
2018-02-07 06:30:35 +00:00
Qt Submodule Update Bot
0687514221 Update submodules on '5.11' in qt5
Change-Id: I8e2b737f940e5712c49eadf688983607e4ec349c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-07 05:40:13 +00:00
Johan Klokkhammer Helsing
532f1dea57 Provisioning: Don't test window decorations on Ubuntu 16.04 QEMU
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>
2018-02-07 04:45:09 +00:00
Liang Qi
3279652635 Merge remote-tracking branch 'origin/dev' into 5.11
Change-Id: I3354e454e9b8c686e5d696562096a793e4a0b284
2018-02-06 17:49:39 +01:00
Qt Submodule Update Bot
9a160d28d5 Update submodules on '5.10' in qt5
Change-Id: I818ad09e1071db0369823caf2cd18da601f3bd05
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-06 01:02:56 +00:00
Qt Submodule Update Bot
f322d6047a Update submodules on '5.10.1' in qt5
Change-Id: Ide442890f290ee8ed14950c90f9a0f6852eebc62
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-05 09:17:54 +00:00
Liang Qi
0e4931a8af Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I3b299786e8500b0a8f2c197f7501f8e6e1cf29cf
2018-02-04 15:30:50 +01:00
Joni Jantti
2e329bc68e Provisioning: openSUSE - Set grub timeout to 0
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>
2018-02-03 20:52:57 +00:00
Qt Submodule Update Bot
88811f882e Update submodules on '5.9' in qt5
Change-Id: I14c5e22d5c76b64a573fb32b71580e00c2a3eeba
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-03 15:20:59 +00:00
Liang Qi
4cd14f4625 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I3e4ae2508d632919db77af0f365eb25ace1a69e0
2018-02-03 11:08:26 +01:00
Qt Submodule Update Bot
d10baa6d3a Update submodules on '5.10' in qt5
Change-Id: Iefacfb5735b27e25a7e5eba595245f22a9ae07d1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-02 21:53:38 +00:00
Heikki Halmet
4eaa017023 Provisioning: Disable Network Time Protocol
NTP need to be disabled from all tier2 templates

Task-number: QTQAINFRA-1608
Change-Id: I89e019c23b7a194efffa011200a8c870e3a65d66
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-02 07:14:40 +00:00
Tony Sarajärvi
7f7c87a15d Remove excess sourcing of try_catch
Change-Id: I3bfa7e8755dbae904719212c22549f6965142330
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-02-02 07:14:38 +00:00
Joni Jäntti
1583fbd2bb Add Win7_x64 provisioning for RTA purposes
Windows 7 x64 (Windows 7 msvc2013-x86_64) template
is needed since RTA is starting to deploy machines
from coin.

Task-number: QTQAINFRA-1521
Task-number: QTQAINFRA-1615
Change-Id: I7e9665bd37ee010a59ff3792f435d65eb9ad8c17
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2018-02-02 07:14:35 +00:00
Qt Submodule Update Bot
213b848cf5 Update submodules on '5.9' in qt5
Change-Id: I839f931dc0c3202543cfbc0137e7f54184efa037
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-02 07:14:32 +00:00
Maurice Kalinowski
f1422dc64b Provisioning: Switch download sources for mqtt paho broker
Internal resources are preferred and should be used first.

Change-Id: Ifd2a54858c9fb6b82c3dc268566c67238aad262e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-02 06:22:53 +00:00
Maurice Kalinowski
e33f38acef Update MQTT provisioning
Setting an environment variable has been centralized to a separate
script.

Change-Id: I027f9a71d32ee7f7d68575c9433f56a40a369deb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-02 06:22:49 +00:00
Qt Submodule Update Bot
29456af9b9 Update submodules on '5.10.1' in qt5
Change-Id: I00b96bfb3f93027136a770a25c7479b1902bcde4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-02 05:09:53 +00:00
Frederik Gladhorn
eb4fcfaba1 Instead of just warning that apt failed, tell why
With the lsof we should see which process was holding the lock.
After that we can disable this source of problems.

Change-Id: Ie6a014bdb101e6230139569c0e4ea51a57089c30
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-02-01 12:33:16 +00:00
Qt Submodule Update Bot
704b2387de Update submodules on 'dev' in qt5
Change-Id: Ie2e621ae2c2387c7daa0c29c5e04c8928fed169b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-31 21:59:37 +00:00
J-P Nurmi
13be05c06d Swap qtquickcontrols vs. qtquickcontrols2 statuses
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>
2018-01-31 21:59:17 +00:00
Frederik Gladhorn
b032d87632 Revert "Adjust submodule branches"
This got merged accidentally.

This reverts commit 282899453d.

Change-Id: I1457513217e636aa54b43a1dc21b01443c798119
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-31 21:59:10 +00:00
Frederik Gladhorn
282a4f0a35 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I30587abcc4062808e13570ff2a158a0fdc60cad2
2018-01-31 08:35:46 +01:00
Frederik Gladhorn
61cd31a5e3 Provisioning: Fix location of sw_versions.txt
I did not see this in the previous direct push.

Change-Id: I620dcc7f1c562e5bd9e09d479a4a5b8598a970fb
2018-01-31 08:32:41 +01:00
Frederik Gladhorn
250e07e99a Merge remote-tracking branch 'origin/5.11' into dev
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
2018-01-29 14:10:44 +01:00
Frederik Gladhorn
a434f14bd9 Merge remote-tracking branch 'origin/5.10' into 5.11
Conflicts:
	coin/provisioning/common/linux/qnx_700.sh
	coin/provisioning/common/windows/libclang.ps1

Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: I7fe1337fb8a575083e8b649d1a051abc82e3b408
2018-01-29 14:06:05 +01:00
Frederik Gladhorn
351a519340 Merge remote-tracking branch 'origin/5.10.1' into 5.10
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: I218ce5567da7ea383009dca2c04beb974511dfcc
2018-01-29 13:44:48 +01:00