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
4,063 Commits 118 Branches 270 Tags
4d99fb00cc49171facd3cf9fe379428a8c8fed13
Commit Graph

3 Commits

Author SHA1 Message Date
Liang Qi
54c94ae681 Merge remote-tracking branch 'origin/5.15' into dev 
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtwebkit.yaml
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Change-Id: If6b0f7a671a69d6a2444ee4d26b324e4d269970c
 2020-04-30 18:35:08 +02:00
Allan Sandfeld Jensen
ca914bdbf3 Fix qtwebwengine.yaml 
Missing an initial separator

Change-Id: I1f447963fbaa93027cfffd7c320efc69ea4a1107
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2020-04-21 16:46:47 +02:00
Allan Sandfeld Jensen
9b7a95964d Add qtwebengine.yaml 
We can't build the wasm version of qtbase any longer

Change-Id: I7436640941702ba2479c7e73f3d1d9ccaf2e7709
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2020-04-21 10:02:36 +02:00