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,619 Commits 118 Branches 270 Tags
caf4c589417d8a9abf3f9f9009055259de59f4d8
Commit Graph

2619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
caf4c58941 Update submodules on '5.11.3' in qt5 
Change-Id: If25a7c3df9d53ff3bd84b75a1dd775e5ab9cd35f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-11 20:42:04 +00:00
Qt Submodule Update Bot
c17352fc12 Update submodules on '5.11.3' in qt5 
Change-Id: Ibf09137346dd0aef4f3dc0a784ad9f4c450f068a
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-09 21:47:12 +00:00
Oswald Buddenhagen
3bb63c22c4 Adjust submodule branches 
Change-Id: Iae1035a9633243bc39e86a6e9133a1263b40a750
 2018-11-02 15:29:23 +01:00
Joni Jäntti
7e67d0e558 Provisioning: RHEL-6.6: Update curl 
The currently used version of curl does not support TLS 1.2 or newer.
Since download.qt.io has minimum requirement of TLS 1.2 we need to
update the these packages.

Task-number: QTQAINFRA-2212
Change-Id: I4737443b5b2180a592a18d9095fe3f31063ba329
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2018-11-02 07:59:24 +00:00
Tony Sarajärvi
b082d7d544 Replace .ci.local addresses with .intra.qt.io in provisioning scripts 
Change-Id: I5e5bc084faabb28ffdf0437871445ecb8970bfb3
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-11-01 07:16:57 +00:00
Qt Submodule Update Bot
195799f36c Update submodules on '5.11' in qt5 
Change-Id: Id39d804153ed5bd04545fdd5fd90ec3cb7de88cf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-11-01 07:16:52 +00:00
Oswald Buddenhagen
1af3c19fc8 commit template: add missing trailing space to Fixes footer 
Change-Id: If966752eeebc7044a9a8ba5a2a66b8c03846c771
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2018-10-29 15:29:44 +00:00
Qt Submodule Update Bot
7ea65aec65 Update submodules on '5.11' in qt5 
Change-Id: I2fd329c2d1097b89ab86768927b605af4c6e2a0f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-10-26 10:28:13 +00:00
Qt Submodule Update Bot
26cece9f93 Update submodules on '5.11' in qt5 
Change-Id: I71eaf20c20124a8634e715aaee11bc0118a84a23
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-10-24 13:26:46 +00:00
Qt Submodule Update Bot
96a07386fb Update submodules on '5.11' in qt5 
Change-Id: I7cd87f5de55b09332b9bfcfd5d4532cbc09072fc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-10-23 18:13:07 +00:00
Qt Submodule Update Bot
ab7b56afe6 Update submodules on '5.11' in qt5 
Change-Id: I2a43b09d5d15775ed17aaa782bb81741f1e15c1f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-10-22 00:20:14 +00:00
Qt Submodule Update Bot
bb1f484318 Update submodules on '5.11' in qt5 
Change-Id: Id7020bdeb4cafb5e6fe83fcf8833b882695205c8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-10-19 10:47:06 +00:00
Qt Submodule Update Bot
2863cdc7aa Update submodules on '5.11' in qt5 
Change-Id: I4327f5eef196cdad0ea41c7e2b8e59ccaa637582
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-10-16 10:07:34 +00:00
Qt Submodule Update Bot
d30c0366db Update submodules on '5.11' in qt5 
Change-Id: I4a586ab957fc68b0afb2334048040e01f398a07b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-10-13 08:53:14 +00:00
Qt Submodule Update Bot
e05e24aa18 Update submodules on '5.11' in qt5 
Change-Id: I0c458253ebe502ad13b40c6dda619ec9779e675e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-10-09 13:15:18 +00:00
Qt Submodule Update Bot
f0f31335e9 Update submodules on '5.11' in qt5 
Change-Id: If72a35b56e4f1a1c102f60d2db543dd07c525dcd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-10-03 04:31:14 +00:00
Qt Submodule Update Bot
0e4743cabf Update submodules on '5.11' in qt5 
Change-Id: Ie4b2b37794d3cfad7da7c7449d287369c5b6315b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-09-27 08:57:36 +00:00
Qt Submodule Update Bot
1ce244fec0 Update submodules on '5.11' in qt5 
Change-Id: Iff73075fe2038d7d1f7fc0853723004b263e994a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-09-26 10:30:13 +00:00
Qt Submodule Update Bot
04b1fb9adc Update submodules on '5.11' in qt5 
Change-Id: I39b766717891eeeca7da66be4b61937f2dec80dd
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-09-18 08:30:08 +00:00
Liang Qi
a0d9b4605e Merge remote-tracking branch 'origin/5.11.2' into 5.11 
Change-Id: Ia69cee4eaced64a0c46123a59918b984ab24317f
 2018-09-17 10:47:59 +02:00
Qt Submodule Update Bot
e4b9ccbbde Update submodules on '5.11' in qt5 
Change-Id: Ia6d0831b5376b92d8e2a261fe9f5626d3f2fddaa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-09-16 13:32:19 +00:00
Qt Submodule Update Bot
01c2cf3d8c Update submodules on '5.11' in qt5 
Change-Id: I7a43072f75fc3ab3fb1814593af0bf6910ac85c7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-09-15 13:02:31 +00:00
Qt Submodule Update Bot
967d28eed2 Update submodules on '5.11.2' in qt5 
Change-Id: Iffc768a304dedfd645219db18ce10fb77515710f
Reviewed-by: Liang Qi <liang.qi@qt.io>
v5.11.2 		2018-09-13 15:33:30 +00:00
Qt Submodule Update Bot
31d989af00 Update submodules on '5.11' in qt5 
Change-Id: If048c9cde7b6374c844cba513658564fe476abc1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-09-13 14:42:50 +00:00
Kai Koehne
6dfe5c31f2 init-repo: Resolve alternate url for git sub-submodules 
Do set correct --alternates argument for sub-submodules like
qtwebengine/src/3rdparty. So far these repositories were always
fully cloned from remote (or the mirror).

Fixes: QTBUG-61901
Change-Id: I19f5930a03ab9050b6e62ac5a5c78780d0544e03
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
 2018-09-13 08:53:29 +00:00
Qt Submodule Update Bot
384ca26700 Update submodules on '5.11.2' in qt5 
Change-Id: Icf8612cbd19dcd417956ce4d56634e7f5a31369e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-09-12 19:49:09 +00:00
Liang Qi
e866953948 Merge remote-tracking branch 'origin/5.11.2' into 5.11 
Conflicts:
	coin/platform_configs/qt5.txt

Change-Id: I430b2b99d1ed463d1750c6f1a5955bc0742f4b35
 2018-09-10 10:12:36 +02:00
Qt Submodule Update Bot
e95824f59e Update submodules on '5.11' in qt5 
Change-Id: I15c5af9f1985ad113fd63c3366bd7f4d8612e4af
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-09-10 07:38:43 +00:00
Qt Submodule Update Bot
bf0b84a051 Update submodules on '5.11' in qt5 
Change-Id: Ie1bf232eae589efe512178d158aef2f3c09a2b7c
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-09-07 05:30:18 +00:00
Antti Kokko
6a919fb8f5 Use MinGW73 for building Qt3D runtime QNX targets 
Change-Id: I0fc650345dcffe8840f440db74cf4d9d48465bf9
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
 2018-09-06 11:41:52 +00:00
Qt Submodule Update Bot
daae11c62b Update submodules on '5.11.2' in qt5 
Change-Id: If0f3dc30be6ad8e10d81c0b8861c9523a07c0894
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2018-09-06 11:41:48 +00:00
Qt Submodule Update Bot
040ca5e267 Update submodules on '5.11.2' in qt5 
Change-Id: If055dba4544826db368e5d46bb8d6b622e08d892
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-09-05 04:40:45 +00:00
Qt Submodule Update Bot
72505cc55b Update submodules on '5.11' in qt5 
Change-Id: I35ae3d03cfa8f5dd202218ffb7d2f0057eb41660
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-09-04 21:30:42 +00:00
Qt Submodule Update Bot
b9b8066d97 Update submodules on '5.11' in qt5 
Change-Id: I89b673b1078c0ffab7e4710b2718008c46127bad
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-09-04 08:45:49 +00:00
Liang Qi
c478262c26 Update submodules on '5.11.2' in qt5 
Change-Id: Iebe3db08c265da0185b58c67aeae3765f8eb5616
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-09-03 19:38:40 +00:00
Heikki Halmet
c870b9b13f Provisioning: Disable mlocate from linux 
No need to update the locate database

Task-number: QTQAINFRA-2099
Change-Id: Iae8bf26e4b04ff9c287e9e3f4cc6f492e74355e4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-09-03 19:38:37 +00:00
Heikki Halmet
967129344a Provisioning: Remove update-manager 
Task-number: QTQAINFRA-2104
Change-Id: Ieaf0801099d8c90821c2b8d9db7da47730fd8abb
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-09-03 19:38:34 +00:00
Heikki Halmet
cd9b6276b8 Provisioning: Disable Cracklib-runtime 
Task-number: QTQAINFRA-2104
Change-Id: I784fa1b3d8c98d765bfdea929fdb494ca63e09d3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-09-03 19:38:32 +00:00
Frederik Gladhorn
8b4d267af7 Add Fixes: tag to commit template 
Change-Id: I2ad6829901be73bd18a8785c2bee3acd3ba20bcc
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 2018-08-31 08:35:56 +00:00
Frederik Gladhorn
5872e22f31 _clang-format: indent initializers with four spaces, not eight 
Change-Id: I9fc644554bd326a3a54163072b7b9e06253a5ff2
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
 2018-08-30 09:09:28 +00:00
Antti Kokko
f70c304b5e Add qt3d-runtime targets 
Task-number: QT3DS-2126
Change-Id: Ibce83cbd513bc0083ac149ed453fc9eb217c1d7a
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
 2018-08-30 08:35:36 +00:00
Qt Submodule Update Bot
5a2a93ddf4 Update submodules on '5.11' in qt5 
Change-Id: Ibde23ec3cee72507c530db0e00c9037d84768890
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-08-29 21:30:44 +00:00
Liang Qi
2b2a639fb9 Unify the iOS/tvOS/watchOS builds in default.txt 
Then we can save more virtual machines.

DebugAndRelease V.S. Release(build time):

qtbase
* iOS static: 14min, 57s : 11min, 35s
* tvOS: 17min, 24s : 9min, 38s
* watchOS: 16min, 36s : 9min, 46s

The longest ones, some win10 builds, are about 40 min. And the
longest ones for tests, are about 1 and half hours.

qtdeclarative
* iOS static: 19min, 10s : 12min, 19s
* tvOS: 20min, 35s : 12min, 55s
* watchOS: 15min, 17s : 9min, 59s

qtwebengine
* iOS static: 12min, 48s : 4min, 14s
* tvOS: 6min, 6s : 4min, 10s
* watchOS: 6min, 21s : 6min, 13s

Change-Id: I51618683de8ed0826120b8baaef1e2e11473283a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2018-08-28 19:02:05 +00:00
Qt Submodule Update Bot
7b029c8ca2 Update submodules on '5.11' in qt5 
Change-Id: I37c29f60c68926fc6cd8b02d06ea139675f6c80e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-28 19:02:01 +00:00
Frederik Gladhorn
b54ad48585 Merge remote-tracking branch 'origin/5.11' into 5.11.2 
Change-Id: I376800d8d095d483bbf5342d90fc5e013415e59a
 2018-08-27 15:54:13 +02:00
Heikki Halmet
a2289e9b4e Provisioning: Change mesa_llvmpipe to use ci-files01-hki as primary url 
This will reduce download time

Task-number: QTQAINFRA-2170
Change-Id: I8313764f7d440e2300a8efabfe4e4226a591d339
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-08-25 07:09:14 +00:00
Heikki Halmet
32fcfb08ce Provisioning: Change jom to use ci-files01-hki as primary url 
This will reduce download time

Task-number: QTQAINFRA-2169
Change-Id: If36ac57daa7066cdd97d5d893a105b812e0eee18
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-08-25 07:09:11 +00:00
Qt Submodule Update Bot
6945c8487c Update submodules on '5.11.2' in qt5 
Change-Id: I63679cff0e7469b9483e521dfa5f59d355e6562e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-25 07:09:07 +00:00
Qt Submodule Update Bot
c620015aac Update submodules on '5.11' in qt5 
Change-Id: Icfc06ccf7128083957edc4478cd810cbb259186c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-08-24 07:22:49 +00:00
Simon Hausmann
cdb1230145 Manual update of just qttools to pull in libclang build fix 
Task-number: QTBUG-69793
Change-Id: I9852567a5268be62b45f605bc0e7a0248278c931
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2018-08-23 09:28:59 +00:00