lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-14 01:05:30 +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

4
.gitmodules vendored
View File

@@ -216,7 +216,7 @@
path = qtwebengine
url = ../qtwebengine.git
branch = 5.13
status = addon
status = ignore
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
@@ -265,7 +265,7 @@
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 5.13
status = addon
status = ignore
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative