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

2734 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
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
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
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
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
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
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
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
Liang Qi
42f4bdd051 Update submodules on 'dev' in qt5 
Change-Id: I15b2964fb22fdac38f172b2a24852fb90a255649
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-20 15:47:47 +00:00
Oliver Wolff
f8086955b3 Provisioning: Install debug version of vclibs for UWP usage 
RTA relies on the availability of debug vclibs. The frameworks are usually
installed on first usage by Visual Studio, but as we use winrtrunner, we
have to install the packages manually.

Task-number: QTBUG-69809
Change-Id: I66cc4b04062afe634345cddc8ab4d001778274cc
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-08-20 13:23:49 +00:00
Qt Submodule Update Bot
8a559f20e3 Update submodules on '5.11' in qt5 
Change-Id: Id6f78adf7c0c3f455b798ad1bc80c7097b519e0b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-08-18 20:52:25 +00:00
Joni Jantti
6077565b3e Provisioning: openSUSE_42.3: Wait for PackageKit to finish 
Provisioning sometimes fails if PackageKit is locked at the moment we
try to remove plasma5-pk-updates package.

Task-number: QTQAINFRA-2141
Change-Id: I5e6c2ecab87033ce01aae915813e1d5f70ea8186
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2018-08-17 16:01:57 +00:00
Maurice Kalinowski
21b3591580 Provisioning: Update MQTT broker 
Required to get shared subscription testing working, namely to fix
https://github.com/eclipse/paho.mqtt.testing/issues/56

Change-Id: Ib8657cde0d8e33135bbc2ebcb9558f8e6b13e40f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
 2018-08-17 16:01:51 +00:00
Qt Submodule Update Bot
50ef5744f5 Update submodules on 'dev' in qt5 
Change-Id: I3968edabb171ffaf9d498f8aaad90843a04fb9ee
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-17 16:01:48 +00:00
Oswald Buddenhagen
31590c0b65 set QTDIR_build in .qmake.super 
this suppresses license checking in default_pre.prf in the super module.
submodules set it via their .qmake.conf's.

Change-Id: Ic3599613140169eeacb48385be8f324c4bef8f1a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
 2018-08-17 13:57:40 +00:00
Qt Submodule Update Bot
d4479f59f8 Update submodules on '5.11' in qt5 
Change-Id: I78af59a68a665f7dec71495a58bf4c2e9e23ade3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-08-17 11:13:36 +00:00
Liang Qi
530a923e68 Update submodules on 'dev' in qt5 
Change-Id: Ibc222c15fe9a02dd4ed34fb3cd4724180bb45680
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-17 07:17:36 +00:00
Qt Submodule Update Bot
82401c04df Update submodules on '5.11' in qt5 
Change-Id: I4c4d079e17fbab5d98b35a9f9311052ac036bb64
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-16 18:42:31 +00:00
Liang Qi
02b7a0b984 Update submodules on 'dev' in qt5 
Change-Id: Ibe68c18b979b20890cfcbfdbedb1620f7914bba4
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-16 17:50:20 +00:00
Qt Submodule Update Bot
c8016c0093 Update submodules on '5.11' in qt5 
Change-Id: If4f598db669ad39d1a0f1042d3666a548aeb3370
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-16 04:16:53 +00:00
Liang Qi
c00f007d32 Update submodules on '5.12' in qt5 
Exclude qtbase in this round.

Change-Id: I0b4c1359b5f5016a1732a290d8e0affa50182e69
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-15 08:16:58 +00:00
Liang Qi
ab25e989b1 Update submodules on 'dev' in qt5 
Exclude qtbase in this round.

Change-Id: I9b781f1add1dea2723e799928db253720b1f2bbd
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-15 08:11:25 +00:00
Liang Qi
726cfcb376 Update submodules on 'dev' in qt5 
Exclude qtbase in this round.

Change-Id: I5cc23b431b7a02ad81bba67af3b124b169f02507
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-15 06:07:22 +00:00
Qt Submodule Update Bot
53a457820c Update submodules on '5.11' in qt5 
Change-Id: Ie97b7d21aeb8326256943a646dce4271405f6982
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-08-15 04:31:14 +00:00
Ryan Chu
23560769c1 Provisioning: Update QEMU toolchains of boot2qt 
Docker-based test server needs mdns to resolve .local while testing qt
network stack in CI. Otherwise the tests would not see announced
services.

Relates to yocto/meta-boot2qt 7608ebe44f65f4d525081cf9a5b12cfa05792a8f

Change-Id: If834b01668bcf844e475e863eb1337849c718270
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
 2018-08-14 21:08:29 +00:00
Oswald Buddenhagen
8b46f403c8 Adjust submodule branches 
Change-Id: Ia24ec2ff93495eed938c5dddab83934327ced02e
 2018-08-14 13:00:09 +02:00
Qt Submodule Update Bot
ff39808a80 Update submodules on '5.11' in qt5 
Change-Id: Ic2fbb75fb89fe0d5ef8204a0ca56dbb8c20aa47d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-08-12 08:50:46 +00:00
Liang Qi
013d1fd540 Update submodules on 'dev' in qt5 
Exclude qtbase in this round.

Change-Id: Ie6f33cfdba6f17c105660263c444a7386561d038
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-08-11 21:01:28 +00:00
Qt Submodule Update Bot
c5d9951e7f Update submodules on '5.11' in qt5 
Change-Id: If6a2c0aaa5d8c906c5b128780e96e287229b0aa8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-08-11 11:25:52 +00:00
Qt Submodule Update Bot
f785a27eac Update submodules on '5.11' in qt5 
Change-Id: Idc7f48f35f25f8b9373aee159ebf742338bc5a50
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-08-10 12:48:24 +00:00