lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-19 02:26:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,063 Commits 120 Branches 272 Tags
4d99fb00cc49171facd3cf9fe379428a8c8fed13
Commit Graph

4063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
a99977cf78 Update submodules on '5.13' in qt5 
Change-Id: I20b6331abe3a914c5cf2503be61c34e2efe60016
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-05 06:41:28 +00:00
Qt Submodule Update Bot
cfea5af0ed Update submodules on '5.12' in qt5 
Change-Id: I99b557104856e3cbf7375f56e7f42b77430bf49f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-05 06:41:22 +00:00
Liang Qi
ed3d7f6cf5 Update submodules on 'dev' in qt5 
Skip qtbase in this round.

Change-Id: I4384f32d093aaaad73146e661bc3f3a56d57328d
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-04 20:02:56 +00:00
Qt Submodule Update Bot
bec94435f8 Update submodules on '5.13' in qt5 
Change-Id: I798c8bc1278a02cdf9043ed50eade5ff66b6502d
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-02 21:38:04 +00:00
Qt Submodule Update Bot
b74bc40b41 Update submodules on '5.12' in qt5 
Change-Id: I31fc2036208413ee138e6154f65af60e15f0e00c
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-02 21:37:30 +00:00
Heikki Halmet
abfc2cd571 Provisioning: Update emsdk version 
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>
 2019-03-02 06:29:52 +00:00
Liang Qi
4df2866684 Update submodules on '5.12' in qt5 
Change-Id: I20eba8a90e0683263245a01eac5a553c78961050
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-01 19:05:44 +00:00
Qt Submodule Update Bot
3a1e557e54 Update submodules on '5.12.2' in qt5 
Change-Id: I3448762f4f01e6fd334927713a61c8d1d6881ab6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-02-28 19:08:08 +00:00
Mårten Nordheim
5c9979a995 Add docker container with iptables 
Used for dropping packets on a specific port.

Needs to be launched with the NET_ADMIN and NET_RAW capabilities to be
able to actually be able to interact with iptables, this is done in
docker-compose.

Change-Id: I5093d19fbc269f42fe3e314e9344866fa5b79999
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
 2019-02-28 10:36:30 +00:00
Mårten Nordheim
03a0872a34 Add docker container with Cyrus 
For its imap server, needed in various tests

Change-Id: I7ad11342f362392edec2f15c781f4c48deeeff30
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
 2019-02-28 10:36:27 +00:00
Mårten Nordheim
9d0022ee44 Add docker container with xinetd 
Needed in the QUdpSocket test for the echo service and in the QSslSocket
test for the daylight service.

Change-Id: Ic7143eb7abd37dbf2c20ddb4b52cdd5ea3f0d193
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
 2019-02-28 10:32:59 +00:00
Antti Kokko
091820f6a1 Remove qt3d-runtime.txt symbolic link from platform configurations 
Caused recursion in CI platform configuration parsing algorithm.
Add qt3d-runtime.txt back as regular file.

Task-number: QTQAINFRA-2804
Change-Id: I11c42a70dcd2157501d4b1f0f67fc7a77a575d31
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-02-28 04:08:21 +00:00
Qt Submodule Update Bot
ffe8fd7701 Update submodules on '5.12.2' in qt5 
Change-Id: Ifc604747b5d94f44948a710e2f9b1c0a5318eaa5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-02-27 19:35:15 +00:00
Qt Submodule Update Bot
e9d5fdaa20 Update submodules on '5.13' in qt5 
Change-Id: I33af247c322de51b34dc65381be9e4e03261842d
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-27 16:46:26 +00:00
Liang Qi
2d0e6b81dd Merge remote-tracking branch 'origin/5.12' into 5.13 
Conflicts:
	coin/provisioning/common/windows/android-openssl.ps1

Change-Id: I0755066ece5458040a21b3da6ddbc1656240f5bb
 2019-02-27 12:43:22 +01:00
Heikki Halmet
099b7ffe4c Provisioning: Update emsdk version 
Task-number: QTBUG-73867
Change-Id: I2aabbecbce2fc3378db6c0747fc8146c03fac545
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
 2019-02-26 11:11:15 +00:00
Qt Submodule Update Bot
4e99a6976c Update submodules on '5.13' in qt5 
Change-Id: I7bf5a68c37be83ba2ad4e67ba24bcae7243297a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-26 09:31:40 +00:00
Heikki Halmet
d5c96aad5a Provisioning: Remove docker from macOS provisioning 
When docker provisioning starting test-server in virtual box whole
virtual machine will reboot.

Let's remove docker until it's more stable or we know how to fix it.

Task-number: QTQAINFRA-2801
Change-Id: Iad7437a69c954a90522e44ef27015518fa3f8c1e
(cherry picked from commit 1865b99b527bd9eee80c39e95d47a44096e44e6a)
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
 2019-02-23 13:37:10 +00:00
Heikki Halmet
06fb909429 Provisioning: Change installation order for dotnet-framework 
Windows updates can't be disabled before dotnet-framework is enabled

Task-number: QTQAINFRA-2824
Change-Id: I26c6b9d9aacfd8031a0b05ce48e003822aec3bdc
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-02-23 10:56:58 +00:00
Qt Submodule Update Bot
becac559b7 Update submodules on '5.12.2' in qt5 
Change-Id: Id1d8765c3a400a7e12725ccf7fcff5aef49c47c0
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-23 06:47:32 +00:00
Qt Submodule Update Bot
83d5226604 Update submodules on '5.12.2' in qt5 
Change-Id: I131875e52b21ab1c354955cf82427470094da8ea
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-02-21 19:06:48 +00:00
Juha Karjalainen
9c60d8b190 Fix: Set correct path to environmental variable 
Env variable BREAKPAD_SOURCE_DIR had /src at end which was
not needed.

Change-Id: I4d126c3b7c3b2da03dc2a0ba075b0d4ddad92eeb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2019-02-18 13:17:52 +00:00
Heikki Halmet
da2bd45ba6 Provisioning: Update mysql to Windows 
Currently this is the last version that support x86 for at least Windows.

Task-number: QTQAINFRA-1996
Change-Id: Idd55694837afad2188697b4d5cc009a127ddb760
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
 2019-02-18 07:43:26 +00:00
Samuli Piippo
abbd43c943 Provisioning: update ARMv7 and ARM64 toolchains 
Update toolchains to Yocto Sumo release with GCC 7.3.0

Task-number: QTQAINFRA-2630
Change-Id: I078cfebde1df039a3783f76c37f914f0dda0483f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-02-18 07:41:18 +00:00
Qt Submodule Update Bot
b3b6b100e6 Update submodules on '5.12.2' in qt5 
Change-Id: Iea1284a0920bbae7ebefda199db7564f3d874edc
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-16 06:50:30 +00:00
Qt Submodule Update Bot
1c6f272dd0 Update submodules on '5.12' in qt5 
Change-Id: Ia2c669226e73a545a19c941c5672972a92049534
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-15 07:41:30 +00:00
Juha Karjalainen
ce91433364 Fix failing to disable windows update service 
Sometimes when trying to stop windows update service it fails.
Will now retry disabling wuauserv

Task-number: QTQAINFRA-2632
Change-Id: I5b6bf40aa15bb1f5225dc51e2f7212a01a13e9a6
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-02-14 15:22:56 +00:00
Liang Qi
b0afdd4bc7 Update submodules on '5.13' in qt5 
Change-Id: Ie526118f93295f56e0c2bf951c6fe8ab2b427eea
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-14 11:18:47 +00:00
Qt Submodule Update Bot
391ba3a9ca Update submodules on '5.12' in qt5 
Change-Id: Id119f941479fac5fa63c281ea21555ff99dc9a47
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-14 05:32:36 +00:00
Kari Oikarinen
d5d380f452 Adjust submodule branches 
Change-Id: I309db20815d3b383155e6549b649607e956b8d89
 2019-02-13 09:25:22 +02:00
Qt Submodule Update Bot
6967ec6b73 Update submodules on '5.12' in qt5 
Change-Id: I75976d5f76dfac7cca5e13cf619a1d019b3bc5e3
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-13 05:39:18 +00:00
Juha Karjalainen
80deae9b74 Fix provisioning script dxsdk.ps1 
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>
 2019-02-12 09:10:50 +00:00
Qt Submodule Update Bot
2dff8afa98 Update submodules on '5.12' in qt5 
Change-Id: I758a05cd029f8252523681c19b657e76c7bb22dc
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-12 08:55:19 +00:00
Qt Submodule Update Bot
f64ba39ce5 Update submodules on '5.12' in qt5 
Change-Id: I5a8f3943047e4b222795c08aeb6593b0225ada99
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-11 10:12:41 +00:00
Jani Heikkinen
2471d6dab8 Update qtwebengine 
Change-Id: I4f70e86ee6f22dd4e14780b606294ca26d0e4007
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
v5.13.0-alpha1 		2019-02-09 19:15:13 +00:00
Qt Submodule Update Bot
7bd38a4997 Update submodules on '5.13' in qt5 
Change-Id: I1653a60f6c0b5dab394b364814bcabf566090498
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-08 09:47:56 +00:00
Qt Submodule Update Bot
ef7908d90c Update submodules on '5.12' in qt5 
Change-Id: I7c99a0f95deb83a7aa81f68e1e1be2a7466b21d2
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-08 08:10:27 +00:00
Qt Submodule Update Bot
ab438507e9 Update submodules on 'dev' in qt5 
Change-Id: I6bae6951b1c9253a423cd2d0d38ffea6121415a8
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-07 19:47:54 +00:00
Qt Submodule Update Bot
26ff9bdc3d Update submodules on '5.13' in qt5 
Change-Id: I3fe91983a4719ccd77146ed63165a7939358c3c0
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-07 17:33:49 +00:00
Tony Sarajärvi
9b84c7135b Build MIPS64 with b2qt toolchain 
This configuration verifies big endian builds

Task-number: QTQAINFRA-2492
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 80339a10a4)
Change-Id: I3111190b5c924eb73b037b94be1a0dc48bcc68c2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-02-07 17:33:41 +00:00
Qt Submodule Update Bot
9df5188493 Update submodules on '5.12' in qt5 
Change-Id: I609f70ead9f00039d3c89f9e26b1301bb18931c0
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-07 08:56:38 +00:00
Liang Qi
84aa9b73ad Merge remote-tracking branch 'origin/dev' into 5.13 
Change-Id: If5219843c4f0d4b34fe56a826d0e9bb17d92f877
 2019-02-07 09:31:51 +01:00
Liang Qi
774f18e61a Merge remote-tracking branch 'origin/5.12.1' into 5.12 
Change-Id: I73b9cf3d1cdb2a9f2f88e5568f61447469f45313
 2019-02-06 15:44:34 +01:00
Qt Submodule Update Bot
d926dbe415 Update submodules on 'dev' in qt5 
Change-Id: I78814e361bf5574ed190fc2d98cdc050bb54815e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-06 07:03:59 +00:00
Qt Submodule Update Bot
73f1d0f518 Update submodules on '5.13' in qt5 
Change-Id: I9fbaaaf4870edefceb1a4557799c41077002aaa0
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-06 07:03:09 +00:00
Qt Submodule Update Bot
4f7c2120a7 Update submodules on '5.12' in qt5 
Change-Id: Ia0b08ce2f5513e78cffa4679d7465a30c95de8e4
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-05 19:16:28 +00:00
Tony Sarajärvi
4987a682ff Make qt3d-runtime.txt platform configuration a link 
The content of qt3d-runtime.txt should always be the same as qt5.txt.

Change-Id: I6cdee575206332f6a719acfaacd7072a2178fd78
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-02-04 11:11:43 +00:00
Liang Qi
bee2b8cdb9 Update submodules on '5.12' in qt5 
Change-Id: Ib8b55ed958660be457a7f0852fad9a13d853f1a5
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-04 09:53:02 +00:00
Qt Submodule Update Bot
99b46f7dec Update submodules on 'dev' in qt5 
Change-Id: I8c6d0d5c7679930ca05961dcaac3c71d2819cba8
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-03 03:49:49 +00:00
Tony Sarajärvi
80339a10a4 Build MIPS64 with b2qt toolchain 
This configuration verifies big endian builds

Task-number: QTQAINFRA-2492
Change-Id: I19a8437c5320e7acb97a26fbd5fd62596d3b0fb4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
 2019-02-02 13:16:50 +00:00