lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-20 05:19:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,208 Commits 120 Branches 272 Tags
cfd35cc49849643ce2e1b37c8bebcf0acca8f2bb
Commit Graph

3208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joni Jäntti
7cbb032dc5 Provisioning: Fix vclib path on x86 machines 
The path was incorrect for x86 Windows machines since they use "Program
Files" without the "(x86)" suffix.

Change-Id: Iecfee3b568a4d23b056fab230891f7eeb4d63cc8
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
 2018-09-04 08:28:55 +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
Liang Qi
0be0d5a10c Update submodules on 'dev' in qt5 
Exclude qtdeclarative in this round.

Change-Id: Ica63600c300475dbb7e5357efa7a77f8528de95d
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-09-01 08:26:47 +00:00
Liang Qi
5024bd5725 Merge remote-tracking branch 'origin/5.12' into dev 
Change-Id: I6c3472a0a6c7f1da8e7320cab5cc9b098bd574ba
 2018-08-31 16:32:13 +02:00
Liang Qi
2e6a5787ef Update submodules on '5.12' in qt5 
Exclude qtdeclarative in this round.

Change-Id: I74de8fc02d0c0295dc7746defe11bed50fb0ba5e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-31 13:37:51 +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
Liang Qi
1b65a5d73a Merge remote-tracking branch 'origin/5.11' into 5.12 
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: Iaae974fbfad9130ead96d229829ab472c998e098
 2018-08-30 09:50:50 +02:00
Joni Jantti
e89420945f Add Ubuntu 18.04 to the CI 
Qt 5.12 will have both 16.04 and 18.04
LTS releases verified. Some configurations
are upgraded from 16.04 to 18.04.

Task-number: QTQAINFRA-1983
Change-Id: I1b5c2a1c23ce209040b3478cff21b7f6436a9b54
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2018-08-30 04:53:50 +00:00
Liang Qi
90e3bb68e6 Update submodules on 'dev' in qt5 
Exclude qtdeclarative in this round.

Change-Id: Ie2d5d427fed014ddb32da17c6b58f5ee2f261ef7
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-30 04:52:58 +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
Frederik Gladhorn
e470da9d65 Make xmlpatterns depend on declarative 
After moving the xmllistmodel into qtxmlpatterns we can reverse the
dependency. This will improve build times and cleaning up dependencies
makes sense in any case.

Change-Id: I560d51ee47167a0cb519b98a15e6eb9199b4cd79
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2018-08-29 05:50:07 +00:00
Liang Qi
cf405ea20e Update submodules on '5.12' in qt5 
Exclude qtdeclarative in this round.

Change-Id: Iad9c2862709be91155a9a72af77fb769528768cc
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-29 05:50:00 +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
Qt Submodule Update Bot
f767b01159 Update submodules on 'dev' in qt5 
Change-Id: I55dc0bf5d0107b8a54278e7116aabfb81f45da16
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-08-28 16:30:09 +00:00
Tony Sarajärvi
3044d0d454 Enable autotests on macOS 10.13 
Task-number: QTQAINFRA-1301
Change-Id: I65680f2a0fd42b7473da05f71a8f1cb3d733a360
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-28 16:29:52 +00:00
Liang Qi
e999cc7df9 Move iOS/tvOS/watchOS build host to macOS 10.13 
Task-number: QTBUG-70180
Change-Id: I6b4b90883cccfdaedbeb0440b62a1b8290655838
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-08-28 05:05:48 +00:00
Liang Qi
02336a3ac0 Provisioning: need to install packages in Xcode 
Task-number: QTBUG-70180
Change-Id: I23134b887bf7fa05e29bd16769fdb9c7f025764e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
 2018-08-28 05:05:44 +00:00
Liang Qi
5f57766742 Update submodules on '5.12' in qt5 
Exclude qtdeclarative in this round.

Change-Id: I1a4a5cbf3817b40e47701fdc5a0f6f4df18633c9
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-28 05:05:41 +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
Simo Fält
d0d326dddd Replace MinGW 5.3.0 with 7.3.0 
Task-number: QTQAINFRA-1289
Task-number: QTQAINFRA-1389
Change-Id: Ic6f637170cd4b98ece45811e66dbb21dc3ee66e3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2018-08-26 19:16:55 +00:00
Qt Submodule Update Bot
aab459709f Update submodules on 'dev' in qt5 
Change-Id: Ie4a7236b6930c030a89f0fcde20b3c87aa3d147d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-08-26 15:30:25 +00:00
Qt Submodule Update Bot
a11917306e Update submodules on 'dev' in qt5 
Change-Id: Ic292d5bbb54f9fb865e8cc6209100342a4cc1952
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-25 19:41:27 +00: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
Liang Qi
7e43cc3c7c Merge remote-tracking branch 'origin/5.12' into dev 
Change-Id: If94f226052c35a2400eaeeef450bf75c07367a6e
 2018-08-25 00:02:02 +02:00
Qt Submodule Update Bot
5c1c629796 Update submodules on 'dev' in qt5 
Change-Id: Iefc67aa6602258a06a35c37cda032e86687b4165
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-24 20:44:06 +00:00
Tony Sarajärvi
5745c4da94 Cleanup of unused macOS 10.10 provisioning scripts 
Change-Id: Iae988527c2ed9a27bb724072064cd6d1dcd55f08
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-24 18:24:57 +00:00
Maurice Kalinowski
ba5211d85f Provisioning: Fix open62541 on msvc2015 x86/x64 
The correct vcvars resides in Visual Studio 14, not 12.

Change-Id: I89e75b4c5c7806ac451f645b3bf341f588818040
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
 2018-08-24 18:24:53 +00:00
Simo Fält
0125d70806 Provisioning: Disable spotlight in macOS 
While the VM we launch is a clean image the spotlight starts indexing
right after the boot. That seems to require quite a lot of resources.
Build machine doesn't need the feature, so we are disabling it.

Change-Id: I2c5f0030d7a687cfbded4e9bd4da70302cb0a933
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-24 18:24:50 +00:00
Simon Hausmann
9a7555e54d Fix failing assertions in QML when running under qemu 
Unfortunately the user-space emulation mode of qemu does not implement
MADV_DONTNEED, which is a feature that the garbage collector of QML
relies on. Patch is submitted to the qemu list and included here to fix
the imminent issue we're seeing.

Task-number: QTBUG-68349
Change-Id: I2bb15513a1e5a7ad03eeae98d77691336985a20f
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 2018-08-24 18:24:47 +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
Tony Sarajärvi
096780db16 Drop testing of macOS 10.11 in the CI 
The 10.11 configurations were bumped to 10.12 configurations.
The 10.12 packaging configuration will be deleted once autotests
have been enabled for 10.13 and packaging moved to 10.13 cross
the board.

Task-number: QTQAINFRA-2055
Change-Id: I17c598a306487e9a2f72006c3fa02e4ee683ee12
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-24 06:50:09 +00:00
Qt Submodule Update Bot
4b2a2d2d92 Update submodules on '5.12' in qt5 
Change-Id: I82cbc9879fd675685e3ac4eb4b368f975c2a27a1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-08-24 06:50:05 +00:00
Liang Qi
2a439be756 Update qtbase manually 
Change-Id: Ic48eee5dcf4b6f05713a6ab04c39cfcb6baa8bef
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-23 14:36:48 +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
Simon Hausmann
1e9fb7f9d9 Prospective fix for build of qttools on Windows with QNX target 
This modules contains qdoc as a host build tool, which needs to be built
with MinGW 7.3 as host compiler in order for the libclang linkage to
succeed. That linkage is forced via QDOC_USE_STATIC_LIBCLANG, which is
set on the Windows 10 machine.

Task-number: QTBUG-69793
Change-Id: I2f0ce81c58ae049d9d59559dfe4f457d082cc98d
Reviewed-by: Simo Fält <simo.falt@qt.io>
 2018-08-23 09:28:56 +00:00
Heikki Halmet
3dd549d618 Provisioning: Fix activate of static linking for libclang 
Task-number: QTBUG-69793
Change-Id: Ib5151e16d0e040a63a3f7fce054f2fad6abb2b6d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-08-23 09:28:51 +00:00
Qt Submodule Update Bot
c3e5f325bb Update submodules on '5.11' in qt5 
Change-Id: I4f4c59dc396299e2c6a398521174e91cc7cac2ec
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-08-23 09:27:34 +00:00
Qt Submodule Update Bot
f35a0cb742 Update submodules on '5.11' in qt5 
Change-Id: I4195ceeeefeb98c8d600b86079f986d2d18e6884
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-08-22 04:31:17 +00:00
Qt Submodule Update Bot
6b6f337925 Update submodules on '5.12' in qt5 
Change-Id: Ie06d6075cf0f157f892e829dabdf5890a646b4ce
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-21 15:13:59 +00:00
Qt Submodule Update Bot
79c3ea18ed Update submodules on '5.11' in qt5 
Change-Id: I3b4d492fcaca7b1519fea144a944aefda68299ef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-08-21 10:37:49 +00:00
Liang Qi
5360fc7fcf Merge remote-tracking branch 'origin/dev' into 5.12 
Change-Id: I593555fd39b6499d241acb00cc656bcdbef83d77
 2018-08-21 09:26:11 +02:00
Tony Sarajärvi
92088b295c Upgrade Xcode to 9.4.1 
Task-number: QTQAINFRA-2136
Change-Id: I57f64c3dc3b91f21bb6d42ab5dc5163db75120b9
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-20 19:02:25 +00:00