lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-21 05:49:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,378 Commits 120 Branches 272 Tags
0c0ed734ef2cb6eaecbbff4c60b1aa91c546e697
Commit Graph

3378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kari Oikarinen
84aaf6871c Adjust submodule branches 
Change-Id: I28500be5d253a4d047cef1409659c275c314d5b0
 2019-03-25 10:07:35 +02:00
Qt Submodule Update Bot
eb3c52455c Update submodules on '5.13' in qt5 
Change-Id: I2a21f0c7eabe7697691bbe330fd0c74058997bb1
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-23 08:32:55 +00:00
Qt Submodule Update Bot
b02d849d76 Update submodules on '5.12' in qt5 
Change-Id: I944abf1de570b68229ba2284e93e879aadc21b2d
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-23 08:32:42 +00:00
Tony Sarajärvi
665703efc9 Remove 32bit MSVC 2015 from the CI 
Task-number: QTQAINFRA-2251
Change-Id: I4006c7390759e2eb357309de36eb23af007a576e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
 2019-03-23 08:32:35 +00:00
Juha Karjalainen
a97d669a20 Provisioning: Remove certificate printing to log 
macOS openssl provisioning printed certificates to log. This patch
prevent printing certificates to log by redirecting it to /dev/null

Task-number: QTQAINFRA-2841
Change-Id: I9ec120212a1f068fa040a302cb50e775857cbb74
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
 2019-03-22 12:06:56 +00:00
Qt Submodule Update Bot
7cc57995bf Update submodules on '5.12' in qt5 
Change-Id: Idba1b3637a56b7bf822c6a0bff29dd91dca735b7
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-22 08:56:29 +00:00
Qt Submodule Update Bot
3003529631 Update submodules on '5.13' in qt5 
Change-Id: I0c15efb52ebac506133653336a16d09174bb938f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-21 19:49:57 +00:00
Qt Submodule Update Bot
209b8117bd Update submodules on '5.12' in qt5 
Change-Id: I5cd2a0098c21f4d4691261fd5c2c1f535f119a77
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-21 18:29:30 +00:00
Liang Qi
78afd2d4b6 Merge remote-tracking branch 'origin/5.12.2' into 5.12 
Change-Id: I8795e84dd750cbb2b55a03c861b911f57a1e2626
 2019-03-21 14:26:56 +01:00
Qt Submodule Update Bot
323dcdb60f Update submodules on '5.12' in qt5 
Change-Id: If57974194302222651f94a7e7b99cc4e34c3b3a1
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-20 15:31:56 +00:00
Johanna Äijälä
c71f004171 Provisioning: add dependency walker to win10 x86 
Needed by RTA.

Change-Id: I51889477dd6e6f4bdff509ab8f6c1b8307842ebd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-03-20 13:23:34 +00:00
Qt Submodule Update Bot
7158816eed Update submodules on '5.13' in qt5 
Change-Id: I9b5cfc02f045711d84084dd52e3add7baa3a0722
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-17 19:56:39 +00:00
Heikki Halmet
0660a25cca Provisioning: Make gnuwin32 available for windows machines 
This script will install gnuwin32 to the windows machines so it can be
removed from qt5

Task-number: QTBUG-73422
Change-Id: I40b7963efcf047525626fe6f1e3ba50b54d68199
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-03-17 08:16:25 +00:00
Juha Karjalainen
48ab1d879b Fix provisioning disable defragmentation for windows 
If no scheduled task exist it would throw error causing
provisioning to fail. Now catch when scheduling does not exist.

Task-number: QTQAINFRA-2823
Change-Id: I3bf24df6116b6c978171950bf5bf954f5ddee533
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-03-15 09:13:16 +00:00
Qt Submodule Update Bot
deecc97dc2 Update submodules on '5.13' in qt5 
Change-Id: Ibd880c74a5842a88d8ee0a8cb1eaf3487b4f7192
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-14 17:00:45 +00:00
Liang Qi
bbce3228af Merge remote-tracking branch 'origin/5.12' into 5.13 
Conflicts:
	coin/provisioning/common/linux/emsdk.sh

Change-Id: I9ba6a1c52b70b605f0f856b6ce6912fd499792a3
 2019-03-14 12:10:15 +01:00
Johanna Äijälä
675deb1474 Add Squish for MSVC2017 x64 to Win10 x64 machines 
Also Squish for MinGW x86 on Win7 x86.

Change-Id: Ie73371b7993f94f32ef1cd2b90f340cf20935e0b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-03-14 05:27:53 +00:00
Qt Submodule Update Bot
0545584315 Update submodules on '5.13' in qt5 
Change-Id: I8c823bab00e24f89a748986bf3eacf12d8de1d46
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-13 20:33:23 +00:00
Qt Submodule Update Bot
4c46984c46 Update submodules on '5.13' in qt5 
Change-Id: I87f15314cf01a1b0482b1675c1eeaed380d92a3d
Reviewed-by: Liang Qi <liang.qi@qt.io>
v5.13.0-beta1 		2019-03-13 09:12:10 +00:00
Paul Wicking
cc1203311a Update comment in clang-format file 
Change-Id: I18f14a1956f508317f8a3995873a14bc1af29594
Reviewed-by: Andy Maloney <asmaloney@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 2019-03-11 10:33:26 +00:00
Qt Submodule Update Bot
f9c5acb2ff Update submodules on '5.12' in qt5 
Change-Id: I4f983c014f06d1d396b13fde8e58d473bf5c988a
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-11 06:19:46 +00:00
Qt Submodule Update Bot
fc1d5bbe4c Update submodules on '5.13' in qt5 
Change-Id: I696da0adc9f8f11c08765662016972d4c47a8a04
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-11 05:16:35 +00:00
Heikki Halmet
76c80866af Provisioning: Help script for removing items 
Sometimes items are locked (access denied) so we need to have function
which waits and retry until removing is possible.

Task-number: QTQAINFRA-2806
Change-Id: I09055c45c0e439ed1a20eb575ee79b7ca22c5745
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
 2019-03-10 14:32:03 +00:00
Qt Submodule Update Bot
afa1b053fe Update submodules on '5.12' in qt5 
Change-Id: I324c45e79a1719943cdd8544a3ddbefc9394421c
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-08 21:38:55 +00:00
Paul Wicking
e403403b39 Update clang-format config 
Set column width to 100 as described in the official Qt coding style
(https://wiki.qt.io/Qt_Coding_Style).

Also, break constructor initializers before the colon and after the commas.

Change-Id: I6ac5a21ce831a35a0d74e699192ba981c8a8ba3c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
 2019-03-08 13:53:33 +00:00
Qt Submodule Update Bot
9a5d221afc Update submodules on '5.13' in qt5 
Change-Id: I85f2cd016dc8c3e98e39ebee057d1d6bfc71d19b
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-08 12:09:53 +00:00
Qt Submodule Update Bot
ec772e3e4a Update submodules on '5.12' in qt5 
Change-Id: Ie5d3cf0419efe268c3268fd4e5038c61677e57ea
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-03-08 08:50:13 +00:00
Qt Submodule Update Bot
7100c54887 Update submodules on '5.12.2' in qt5 
Change-Id: I9fc68dfd357dd32546248dee88558744502cb24c
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
v5.12.2 		2019-03-08 04:47:08 +00:00
Johanna Aijala
88b35a4921 Update Squish to 6.4.3 
Froglogic has not yet released Squish for Qt5.13 but we can use Squish
packages build with Qt5.12.

Remove msvc12 Squish, not needed.

Change-Id: I1de1bb67a5577fa7f7233c69c3a58bedd15fd16b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-03-07 06:18:26 +00:00
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
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
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