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

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

Browse Source 
Change-Id: I415772838a8434d00ad4ccebc8b1c4180e85880b
This commit is contained in:
Liang Qi
2017-03-04 22:21:23 +01:00
parent 111799abf1 8de4f42cb6
commit ad3c519525
12 changed files with 474 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -237,7 +237,7 @@
status = addon
[submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel
recommends = qtlocation
recommends = qtlocation qttools
path = qtwebengine
url = ../qtwebengine.git
branch = 5.9