lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-24 16:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.7' into 5.8.0

Browse Source 
Change-Id: Ic9a6b04afe47529c4f953bace93e9c17d8c4d39d
This commit is contained in:
Liang Qi
2016-12-02 09:01:44 +01:00
parent aed00a8dd3 d379d768e6
commit 2c27ccd1c9
46 changed files with 1592 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@@ -11,7 +11,7 @@
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg qtxmlpatterns
recommends = qtxmlpatterns
path = qtdeclarative
url = ../qtdeclarative.git
branch = 5.8.0
@@ -100,7 +100,7 @@
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
recommends = qtdeclarative qtsvg
path = qtsensors
url = ../qtsensors.git
branch = 5.8.0
@@ -160,7 +160,7 @@
status = addon
[submodule "qtquick1"]
depends = qtscript
recommends = qtsvg qtxmlpatterns
recommends = qtxmlpatterns
path = qtquick1
url = ../qtquick1.git
branch = dev