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

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

Browse Source 
Change-Id: I1c5420f9d0a192f55623b2d46aec7a15b7877609
This commit is contained in:
Liang Qi
2016-11-17 11:41:55 +01:00
parent f8e075a679 98c92cc95f
commit acd40269d3
2 changed files with 23 additions and 10 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.7
@@ -100,7 +100,7 @@
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
recommends = qtdeclarative qtsvg
path = qtsensors
url = ../qtsensors.git
branch = 5.7
@@ -160,7 +160,7 @@
status = addon
[submodule "qtquick1"]
depends = qtscript
recommends = qtsvg qtxmlpatterns
recommends = qtxmlpatterns
path = qtquick1
url = ../qtquick1.git
branch = 5.7