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

Merge remote-tracking branch 'origin/5.9.0' into 5.9

Browse Source 
Conflicts:
	.gitmodules

Change-Id: Ifa5edde4cfd68df959fabb6a61595d8c1b28b099
This commit is contained in:
Liang Qi
2017-05-26 10:29:43 +02:00
parent 613242b2bf 4d6b04db3c
commit 1f15ce005f
8 changed files with 104 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -68,7 +68,7 @@
url = ../qtrepotools.git
branch = master
status = essential
qt = false
project = -
[submodule "qtwebkit"]
depends = qtbase
recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns