lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-02 10:37:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.15' into 5.15.0

Browse Source 
Conflicts:
	.gitmodules

Change-Id: I72e0314fbc563a2386f2389239b927f57124c511
This commit is contained in:
Liang Qi
2020-04-24 22:34:43 +02:00
parent 767711b44a 5b018f96af
commit 3050559262
44 changed files with 1397 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -150,7 +150,7 @@
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
branch = 5.15.0
status = addon
status = essential
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects