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/dev' into wip/cmake

Browse Source 
Conflicts:
	.gitmodules
	coin/platform_configs/default.txt

Change-Id: I78eb6b6522c678fb40f1202c0040c1c87ff890a6
This commit is contained in:
Liang Qi
2019-09-23 16:38:06 +02:00
parent 709e687c84 fd87ff83aa
commit 44073f5563
164 changed files with 4633 additions and 2086 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.gitmodules vendored
View File

@@ -312,3 +312,15 @@
url = ../qtlottie.git
branch = dev
status = ignore
[submodule "qtquicktimeline"]
depends = qtbase qtdeclarative
path = qtquicktimeline
url = ../qtquicktimeline
branch = dev
status = ignore
[submodule "qtquick3d"]
depends = qtbase qtdeclarative
path = qtquick3d
url = ../qtquick3d.git
branch = dev
status = ignore