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

Merge remote-tracking branch 'origin/5.12.0' into 5.12

Browse Source 
Change-Id: Ifb4277657a6f85e6a6d0ee62e54360b2cb1c0514
This commit is contained in:
Liang Qi
2018-12-22 23:21:54 +01:00
parent db99f0563d 061cf1f2ca
commit 0e82de327b
4 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@@ -211,7 +211,7 @@
status = addon
[submodule "qtwebengine"]
depends = qtdeclarative
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
path = qtwebengine
url = ../qtwebengine.git
branch = 5.12
@@ -297,11 +297,11 @@
path = qtremoteobjects
url = ../qtremoteobjects.git
branch = 5.12
status = preview
status = addon
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
recommends = qtdeclarative
path = qtwebglplugin
url = ../qtwebglplugin.git
branch = 5.12
status = preview
status = addon