lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-20 20:06:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.12' into 5.13

Browse Source 
Conflicts:
	.gitmodules
		ignore QtWebEngine on QEMU temporarily.
	coin/platform_configs/default.yaml
		no-gui build was removed temporarily.
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtconnectivity.yaml
	coin/platform_configs/qtsaferenderer.yaml

Task-number: QTQAINFRA-2576
Task-number: QTBUG-77304
Task-number: QTBUG-77305
Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: If7cf75791677eace762374b92382a2ce15f17f55
This commit is contained in:
Liang Qi
2019-08-02 12:14:55 +02:00
parent 4c5d3f2e43 125c5e6528
commit a94696ccd5
97 changed files with 3558 additions and 2108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/common/shared/requirements.txt
View File

@@ -13,7 +13,7 @@ Jinja2==2.10
MarkupSafe==1.0
path.py==11.0.1
pathtools==0.1.2
PyYAML==3.13
PyYAML==5.1
six==1.11.0
typing==3.6.4
watchdog==0.8.3