lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 11:26:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.8' into 5.9

Browse Source 
Change-Id: Ic7dab06f6b6e6cf326df651151eade22429b997f
This commit is contained in:
Simon Hausmann
2017-02-05 15:16:27 +01:00
parent 2c1d5ad754 bbdeca02e9
commit 527829a600
11 changed files with 246 additions and 24 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 = qtxmlpatterns
recommends = qtsvg qtxmlpatterns
path = qtdeclarative
url = ../qtdeclarative.git
branch = 5.9
@@ -100,7 +100,7 @@
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative qtsvg
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 5.9
@@ -160,7 +160,7 @@
status = addon
[submodule "qtquick1"]
depends = qtscript
recommends = qtxmlpatterns
recommends = qtsvg qtxmlpatterns
path = qtquick1
url = ../qtquick1.git
branch = dev