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

Browse Source 
Conflicts:
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh

Change-Id: If414fac20cc1cddd155a9f9c8048d0ad76ac54ef
This commit is contained in:
Liang Qi
2018-08-06 11:31:33 +02:00
parent a43a23f7d1 00730d1caf
commit d746bc3ea8
9 changed files with 98 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitmodules vendored
View File

@@ -143,13 +143,6 @@
url = ../qtimageformats.git
branch = dev
status = addon
[submodule "qtquick1"]
depends = qtscript
recommends = qtsvg qtxmlpatterns
path = qtquick1
url = ../qtquick1.git
branch = dev
status = ignore
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects