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.0' into 5.6

Browse Source 
Conflicts:
	.gitmodules

Change-Id: Ic9c8564006c2722f925700f09ff42da3e912f580
This commit is contained in:
Liang Qi
2016-03-31 09:53:10 +02:00
parent f05fece2f7 84a1676ed6
commit c80e96bb09
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@@ -28,7 +28,7 @@
path = qtscript
url = ../qtscript.git
branch = 5.6
status = addon
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
@@ -144,7 +144,7 @@
path = qtwayland
url = ../qtwayland.git
branch = 5.6
status = preview
status = addon
[submodule "qt3d"]
depends = qtdeclarative qtimageformats
path = qt3d
@@ -219,7 +219,7 @@
path = qtenginio
url = ../qtenginio.git
branch = 5.6
status = obsolete
status = deprecated
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative