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

Merge remote-tracking branch 'origin/dev' into 5.14

Browse Source 
Conflicts:
	.gitmodules

Change-Id: Idd7160b4c1aeb43a2c9580e93627eae118b742a3
This commit is contained in:
Liang Qi
2019-08-26 15:59:56 +02:00
parent 3631a12b84 ff75bd5297
commit 6f3f8913d8
8 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@@ -318,3 +318,9 @@
url = ../qtquicktimeline
branch = 5.14
status = preview
[submodule "qtquick3d"]
depends = qtbase qtdeclarative
path = qtquick3d
url = ../qtquick3d.git
branch = 5.14
status = preview