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

Browse Source 
Change-Id: I34a18e1ea9ca774638ffe65d08d1fee46efba4aa
This commit is contained in:
Liang Qi
2018-10-20 14:17:57 +02:00
parent 0345ab91fb 4667cfc432
commit 16c6fa419a
16 changed files with 136 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@@ -210,8 +210,8 @@
branch = dev
status = addon
[submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel
recommends = qtlocation qttools
depends = qtdeclarative
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel
path = qtwebengine
url = ../qtwebengine.git
branch = dev