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
3,105 Commits 118 Branches 270 Tags
deecc97dc248aaa2e5a51bcb00a351c2063b2420
Commit Graph

3105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
1830cca2bc Update submodules on 'dev' in qt5 
Change-Id: Ie71dc26e772ace0d4a7ab51360ad4abe1448d438
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-01 20:55:10 +00:00
Heikki Halmet
3cb745565f Provisioning: Renew iOS signing certificates 
Task-number: QTQAINFRA-2690
Change-Id: I4a058c7d88b3daa24f62d5bc314ec2b0ecc8c383
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-02-01 10:50:32 +00:00
Qt Submodule Update Bot
92498bad9c Update submodules on '5.12' in qt5 
Change-Id: I678bfdb4333abc34a29732aef1816d67f46c09cb
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-02-01 05:17:57 +00:00