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

Browse Source 
Conflicts:
	coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh

Change-Id: I10fcdfc0af68741d931f4732783bafdad2fffc4a
This commit is contained in:
Simon Hausmann
2017-02-03 09:15:43 +01:00
parent 321d5f1488 a36977963a
commit d641d6546b
6 changed files with 176 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.8
@@ -100,7 +100,7 @@
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative qtsvg
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 5.8
@@ -160,7 +160,7 @@
status = addon
[submodule "qtquick1"]
depends = qtscript
recommends = qtxmlpatterns
recommends = qtsvg qtxmlpatterns
path = qtquick1
url = ../qtquick1.git
branch = dev