lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,354 Commits 118 Branches 270 Tags
36d5e1a7948b2f09c868fca2367d2ca1584e9445
Commit Graph

2354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liang Qi
36d5e1a794 Merge remote-tracking branch 'origin/5.11' into dev 
Change-Id: Ie83ca342acce563e85620c3998ae7e9f74a7c4bc
 2018-02-23 22:16:13 +01:00
Frederik Gladhorn
b20224fe60 Uninstall aptdaemon/aptd before using apt 
This removes various kinds of update notifiers that depend on aptd.
Also gets rid of the problem that aptd may hold apt lock files.

Task-number: QTQAINFRA-1755
Change-Id: I27dd6fef4720ef25a504d76a3da16d9bf45fb2f7
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-02-23 21:00:32 +00:00
Joni Jantti
f6f00fdce1 Provisioning: Win7-x86 - Add msvc14_x86 squish package 
Squish is required by RTA testing.

Task-number: QTQAINFRA-1732
Change-Id: I8ab0b11ccc299cc0b10e59f99d1cf27c0cdd48b9
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-02-23 21:00:29 +00:00
Joni Jantti
f6f5cc70e9 Provisioning: openSUSE-42.3 - Disable update notifications 
Update notifications need to be disabled to prevent popup messages
from stealing focus during testing.

Task-number: QTQAINFRA-1755
Change-Id: I202ffbee6420d2c9c167a97f02d5245145b618d0
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2018-02-23 21:00:25 +00:00
Matti Paaso
c3b33afc32 Provisioning: osx-10.11 - Java 
This is needed for running RTA jobs in Coin.

Change-Id: Iff855dae54babef00c055a2c8b938871101305e3
Reviewed-by: Simo Fält <simo.falt@qt.io>
 2018-02-23 21:00:21 +00:00
Joni Jantti
5e31866727 Provisioning: Win10 - Add Squish for mingw53 
RTA requires Squish for mingw53 on Windows 10 machines for testing.

Task-number: QTQAINFRA-1729
Change-Id: I42f2c6c62dd004ebc072835340ce24105cfac5e8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2018-02-23 21:00:19 +00:00
Joni Jantti
b1a212b52e Provisioning: Make Windows scripts use the Download helper function 
Some Windows provisioning scripts use the Invoke-WebRequest without
setting the ProgressPreference = 'SilentlyContinue' variable for
disabling the download progress bar. Disabling the progress bar
greatly increases the download speed during provisioning.

Change-Id: I649c1bcc970577776d720a4ebf5a7af96c1603f8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2018-02-23 21:00:15 +00:00
Tony Sarajärvi
54d8396d68 Set proxy on Windows VMs while provisioning 
Task-number: QTQAINFRA-1669
Change-Id: Ia6b5b668051642a3729d7c7c83c69d8797045847
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2018-02-23 21:00:11 +00:00
Heikki Halmet
3a3c6fb2b3 Provisioning: Fix Windows 10 msvc 2014 squish installation 
Change-Id: Id935580730d20a2f86fa6c82bf08ee3705f344f2
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-02-23 21:00:08 +00:00
Qt Submodule Update Bot
b17fcbe630 Update submodules on 'dev' in qt5 
Change-Id: Ia6f8ec8bb3361419f6d50dbddb665e974a2f1fca
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-02-23 09:08:49 +00:00
Tony Sarajärvi
ae17b63db2 Add shebang to launchable script 
Change-Id: I62e33b656eee3a17e1dab4476569d9afa0b62a45
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
 2018-02-23 08:20:34 +00:00
Maurice Kalinowski
acbedcc314 Provisioning: Update Open62541 
This is required to use new APIs from the library.

Change-Id: Idbadfd04c331af228a9e095e130930b5fb88f7af
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
 2018-02-23 08:20:31 +00:00
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