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.8.0' into 5.8

Browse Source 
Conflicts:
	.gitmodules

Change-Id: I749924de83f87e436448bf1287fe057e2fe4c45b
This commit is contained in:
Liang Qi
2016-12-05 10:00:11 +01:00
parent 91191afe3f 2c27ccd1c9
commit 97e6ed74e4
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
@@ -100,7 +100,7 @@
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
recommends = qtdeclarative qtsvg
path = qtsensors
url = ../qtsensors.git
branch = 5.8
@@ -160,7 +160,7 @@
status = addon
[submodule "qtquick1"]
depends = qtscript
recommends = qtsvg qtxmlpatterns
recommends = qtxmlpatterns
path = qtquick1
url = ../qtquick1.git
branch = dev