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' into dev

Browse Source 
Conflicts:
	.gitmodules

Change-Id: I6f34dcaedd77228215e1cfa92cd12b6334a41834
This commit is contained in:
Liang Qi
2019-04-14 23:11:30 +02:00
parent 74eab55ea8 f2af07b8ed
commit e10a2d4ffe
86 changed files with 304 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -49,7 +49,7 @@
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = dev
status = addon
status = deprecated
[submodule "qttranslations"]
depends = qttools
path = qttranslations