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

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

Browse Source 
Conflicts:
	.gitmodules

Change-Id: I9b4e8807941f49ed930372cc3466c97110794849
This commit is contained in:
Liang Qi
2019-08-09 09:01:57 +02:00
parent 9e370453bb f32c9f755e
commit 49c808befb
4 changed files with 30 additions and 4 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 = ignore
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
@@ -265,7 +265,7 @@
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 5.13
status = ignore
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative