lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-09 01:38:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,592 Commits 118 Branches 270 Tags
d1601aa0f94de81fe6b1651a2a3f5ce0a52a1ed3
Commit Graph

4592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liang Qi
238cb26099 Update submodules on 'dev' in qt5 
Change-Id: Ia8de2d8c35a6a021fd22522a642caa82d960aed2
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-02-23 06:31:08 +00:00
Liang Qi
3ba940924d Merge remote-tracking branch 'origin/5.10' into 5.11 
Change-Id: Ia450fbc4398a627ebb37646b408a0692cc970094
 2018-02-22 09:06:19 +01:00
Qt Submodule Update Bot
8eed3b5be4 Update submodules on '5.11' in qt5 
Change-Id: I1447f714aa1035c2cdbe423935cc5a67a700de2d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-02-22 06:56:53 +00:00
Liang Qi
93ff678878 Merge remote-tracking branch 'origin/5.11' into dev 
Change-Id: Ib867a3e53f624b8963e6dab311fe5c2a28c87801
 2018-02-21 09:57:48 +01:00
Liang Qi
91739f5fe3 Merge remote-tracking branch 'origin/5.9' into 5.11 
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
 2018-02-20 22:33:59 +01:00
Oswald Buddenhagen
c64b2415d3 init-repo: complain about non-option arguments 
otherwise abuse may go unnoticed (at this stage ...).

Change-Id: Ic8c2a843a941cdeb2d69542830eccf7fadcf252d
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
 2018-02-20 11:20:20 +00:00
Matti Paaso
884490eaae Add RTA targets 
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>
 2018-02-20 10:47:12 +00:00
Qt Submodule Update Bot
bcaeff8210 Update submodules on '5.11' in qt5 
Change-Id: I069e5672ed40279dbbd8769be17f5cb328b12bc1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-02-19 07:15:40 +00:00
Qt Submodule Update Bot
060d0bdec1 Update submodules on '5.11' in qt5 
Change-Id: I92f9401dc98ab115fe737ec5395025055830140f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-02-18 21:40:38 +00:00
Qt Submodule Update Bot
e086fbc6cb Update submodules on '5.9' in qt5 
Change-Id: Ie7a64cad655dd0e850c8c6145f35b425de6f4c25
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-02-17 21:25:08 +00:00
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
Liang Qi
c152f646db Update submodules on 'dev' in qt5 
Change-Id: Icbb7b51a46c55ed4ec7690e6cdceedf4680f3b2f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-02-14 06:54:00 +00:00
Liang Qi
3d445e8b77 Merge remote-tracking branch 'origin/5.11' into dev 
Change-Id: Iac3ddede9c1d6b0de5a30b3490d5564995afaabc
 2018-02-13 21:18:24 +01: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
Qt Submodule Update Bot
9cb9e7654a Update submodules on 'dev' in qt5 
Change-Id: Ibb42cbf10eb51d99e5d26a3e616bf488f9b5bd28
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-02-12 05:26:25 +00:00
Qt Submodule Update Bot
623528bf40 Update submodules on 'dev' in qt5 
Change-Id: Id7d9342393bbf3068dd7a1c90dc2afe365d80962
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-02-11 19:13:43 +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
a969ebdb84 Update submodules on 'dev' in qt5 
Change-Id: If9edf8eca3865c32db056bb8f167dc47530c9d37
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-02-10 07:47:38 +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
f50cada914 Update submodules on 'dev' in qt5 
Change-Id: I712f991abb4fb97e341133c295f2d77330a84a68
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-02-09 13:14:52 +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
25a19a1115 Update submodules on 'dev' in qt5 
Change-Id: I29aba3e5aebc6ee4b2e130b70dbf184ad3d79303
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-02-08 07:30:24 +00:00
Oswald Buddenhagen
9c506a5164 Merge remote-tracking branch 'origin/5.11' into dev 
Change-Id: Ia8d3b57d6cb1b89de7164d7ecede664cf5bd2f58
 2018-02-07 20:17:09 +01:00
Qt Submodule Update Bot
9680fa7860 Update submodules on 'dev' in qt5 
Change-Id: If34630f163416a6ee7b34df5b7f41c47f8f5cfd1
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-02-07 18:34:51 +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
da1189b867 Merge remote-tracking branch 'origin/5.11' into dev 
Change-Id: Icf5a559c89f572249cc1fd54d2c11319597afdf9
 2018-02-07 10:14:50 +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